From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java | 478 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 474 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
index 1eb1313..80d72f9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
@@ -1,19 +1,489 @@
package org.jeecg.modules.eam.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.DataBaseConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
+import org.jeecg.modules.eam.constant.*;
+import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentTransfer;
import org.jeecg.modules.eam.mapper.EamEquipmentTransferMapper;
+import org.jeecg.modules.eam.request.EamEquipmentTransferQuery;
+import org.jeecg.modules.eam.request.EamEquipmentTransferRequest;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamEquipmentTransferService;
+import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
+import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.service.IFlowDefinitionService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.UserSelector;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: 璁惧褰掑睘鍙樺姩
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-05-13
* @Version: V1.0
*/
-@Service
-public class EamEquipmentTransferServiceImpl extends ServiceImpl<EamEquipmentTransferMapper, EamEquipmentTransfer> implements IEamEquipmentTransferService {
+@Service("IEamEquipmentTransferService")
+public class EamEquipmentTransferServiceImpl extends ServiceImpl<EamEquipmentTransferMapper, EamEquipmentTransfer> implements IEamEquipmentTransferService, FlowCallBackServiceI {
+
+ @Resource
+ private EamEquipmentTransferMapper equipmentTransferMapper;
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
+ @Autowired
+ private FlowCommonService flowCommonService;
+ @Autowired
+ private IFlowDefinitionService flowDefinitionService;
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
+
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Override
+ public IPage<EamEquipmentTransfer> queryPageList(Page<EamEquipmentTransfer> page, EamEquipmentTransferQuery query) {
+ QueryWrapper<EamEquipmentTransfer> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return page;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
+ }
+// 鎺у埗寰呮彁浜ょ姸鎬佺殑鏁版嵁鍙兘鏈汉鏌ョ湅
+// queryWrapper.and(i -> i.ne("wmo.transfer_status", EquipmentTransferStatusEnum.WAIT_SUBMIT).or().eq("wmo.report_user", sysUser.getUsername()));
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getCode())) {
+ queryWrapper.like("wmo.code", query.getCode());
+ }
+ if (StringUtils.isNotBlank(query.getSealStatus())) {
+ queryWrapper.eq("wmo.transfer_status", query.getSealStatus());
+ }
+ if (query.getLeanDateBegin() != null && query.getLeanDateEnd() != null) {
+ queryWrapper.between("wmo.lean_start_time", query.getLeanDateBegin(), query.getLeanDateEnd());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+
+ return equipmentTransferMapper.queryPageList(page, queryWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean addTransfer(EamEquipmentTransfer request) {
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
+ throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽鍊熷嚭锛�");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞鍊熺敤璁板綍锛�");
+ }
+ if (equipment.getOrgId().equals(request.getNewDepartId())) {
+ throw new JeecgBootException("褰撳墠璁惧灞炰簬姝よ溅闂达紝涓嶉渶瑕佸彉鍔紒");
+ }
+ request.setOldDepartId(equipment.getOrgId());
+ return equipmentTransferMapper.insert(request) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean submit(String id) {
+ EamEquipmentTransfer entity = equipmentTransferMapper.selectById(id);
+ if (entity == null) {
+ throw new JeecgBootException("瑕佹彁浜ょ殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!EquipmentTransferStatusEnum.WAIT_SUBMIT.name().equals(entity.getTransferStatus())) {
+ throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囨彁浜わ紒");
+ }
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝鎻愪氦澶辫触锛�");
+ }
+ // 鍒嗛厤缁欎娇鐢ㄥ崟浣嶉瀵�
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0008);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰鍗曚綅棰嗗锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null || !BusinessCodeConst.PCR0004.equals(sysUser.getPost())) {
+ throw new JeecgBootException("涓嶆槸璁惧绠＄悊鍛橈紝鏃犳硶鎻愪氦姝ゅ伐鍗曪紒");
+ }
+ entity.setTransferTime(new Date());
+ entity.setReportUser(sysUser.getUsername());
+ entity.setTransferStatus(EquipmentTransferStatusEnum.WAIT_USE_LEADER_CHECK.name());
+ //淇濆瓨宸ュ崟
+ equipmentTransferMapper.updateById(entity);
+
+ //鍚姩瀹℃壒娴佺▼
+ flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getCode() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧璋冩嫧",
+ entity.getId(), "IEamEquipmentTransferService", "equipment_transfer", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", entity.getId());
+ variables.put("organization", entity.getTransferReason());
+ variables.put("comment", entity.getTransferReason());
+ variables.put("proofreading", true);
+
+ variables.put("NextAssignee", usernames);
+ Result result = flowDefinitionService.startProcessInstanceByKey("equipment_transfer", variables);
+ if (result != null) {
+ equipment.setAssetStatus(AssetStatusEnum.DEALT.name()); // 璁惧璋冩嫧
+ eamEquipmentService.updateById(equipment);
+ return result.isSuccess();
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.TRANSFERRED, businessTable = "eam_equipment_transfer")
+ public EamEquipmentTransfer approval(EamEquipmentTransferRequest request) {
+ EamEquipmentTransfer entity = equipmentTransferMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒");
+ }
+ // 鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId());
+ if (flowMyBusiness == null) {
+ throw new JeecgBootException("娴佺▼瀹炰緥涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+
+ boolean userAuthorized = isUserAuthorized(flowMyBusiness, user);
+ if (!userAuthorized) {
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔★紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+ // 璁ら浠诲姟
+ if (!claimTask(flowMyBusiness.getTaskId(), user)) {
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒");
+ }
+
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
+
+ //璁剧疆娴佺▼鍙橀噺
+ setupProcessVariables(request, entity, user, equipment);
+
+ // 瀹屾垚娴佺▼浠诲姟
+ Result result = flowTaskService.complete(request);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
+ }
+
+ // 鏍规嵁浠诲姟瀹屾垚缁撴灉鏇存柊宸ュ崟鐘舵��
+ updateOrderStatus(result, request, entity, user, equipment);
+
+ //淇濆瓨宸ュ崟
+ equipmentTransferMapper.updateById(entity);
+ return entity;
+ }
+
+ /**
+ * 璁剧疆宸ュ崟淇℃伅
+ *
+ * @param result
+ * @param request
+ * @param entity
+ * @param user
+ */
+ private void updateOrderStatus(Result result, EamEquipmentTransferRequest request, EamEquipmentTransfer entity, LoginUser user, EamEquipment equipment) {
+ if (result.isSuccess()) {
+ EquipmentTransferStatusEnum status = EquipmentTransferStatusEnum.getInstance(entity.getTransferStatus());
+ switch (status) {
+ case WAIT_USE_LEADER_CHECK:
+ // 浣跨敤鍗曚綅棰嗗瀹℃壒缁撴潫
+ entity.setUseLeader(user.getUsername());
+ entity.setUseLeaderApprovalComment(request.getUseLeaderApprovalComment());
+ entity.setUseLeaderApprovalTime(new Date());
+ entity.setUseLeaderApprovalDealType(request.getUseLeaderApprovalDealType());
+ if (CommonConstant.APPROVED.equals(request.getUseLeaderApprovalDealType())) {
+ entity.setTransferStatus(EquipmentTransferStatusEnum.WAIT_TRANSFER_LEADER_CHECK.name());
+ } else {
+ entity.setTransferStatus(EquipmentTransferStatusEnum.REJECT.name());
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name()); // 璁惧璋冩嫧
+ eamEquipmentService.updateById(equipment);
+ }
+ break;
+ case WAIT_TRANSFER_LEADER_CHECK:
+ // 璋冨叆鍗曚綅棰嗗瀹℃壒缁撴潫
+ entity.setTransferLeader(user.getUsername());
+ entity.setTransferLeaderApprovalComment(request.getTransferLeaderApprovalComment());
+ entity.setTransferLeaderApprovalTime(new Date());
+ entity.setTransferLeaderApprovalDealType(request.getTransferLeaderApprovalDealType());
+ if (CommonConstant.APPROVED.equals(request.getTransferLeaderApprovalDealType())) {
+ entity.setTransferStatus(EquipmentTransferStatusEnum.WAIT_EXTERNAL_CONFIRM.name());
+ } else {
+ entity.setTransferStatus(EquipmentTransferStatusEnum.REJECT.name());
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name()); // 璁惧璋冩嫧
+ eamEquipmentService.updateById(equipment);
+ }
+ break;
+ case WAIT_EXTERNAL_CONFIRM:
+ // 鏈哄姩鍔炵‘璁ょ粨鏉�
+ entity.setExternalConfirm(user.getUsername());
+ entity.setExternalConfirmTime(new Date());
+ entity.setCompanyLeaderCheck(request.getCompanyLeaderCheck());
+ if (CommonConstant.YN_1.equals(request.getCompanyLeaderCheck())) {
+ entity.setTransferStatus(EquipmentTransferStatusEnum.WAIT_COMPANY_LEADER_CHECK.name());
+ } else {
+ entity.setTransferStatus(EquipmentTransferStatusEnum.COMPLETE.name());
+ equipment.setOrgId(entity.getNewDepartId());
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name()); // 璁惧璋冩嫧
+ eamEquipmentService.updateById(equipment);
+ }
+ break;
+ case WAIT_COMPANY_LEADER_CHECK:
+ // 鍏徃棰嗗瀹℃壒缁撴潫
+ entity.setCompanyLeader(user.getUsername());
+ entity.setCompanyLeaderApprovalTime(new Date());
+ entity.setCompanyLeaderApprovalComment(request.getCompanyLeaderApprovalComment());
+ entity.setCompanyLeaderApprovalDealType(request.getCompanyLeaderApprovalDealType());
+ if (CommonConstant.APPROVED.equals(request.getCompanyLeaderApprovalDealType())) {
+ entity.setTransferStatus(EquipmentTransferStatusEnum.COMPLETE.name());
+ equipment.setOrgId(entity.getNewDepartId());
+ } else {
+ entity.setTransferStatus(EquipmentTransferStatusEnum.REJECT.name());
+ }
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name()); // 璁惧璋冩嫧
+ eamEquipmentService.updateById(equipment);
+ break;
+ }
+ }
+ }
+
+ /**
+ * 璁剧疆娴佺▼鍙橀噺
+ *
+ * @param request
+ * @param entity
+ * @param user
+ * @param equipment
+ */
+ private void setupProcessVariables(EamEquipmentTransferRequest request, EamEquipmentTransfer entity, LoginUser user, EamEquipment equipment) {
+ Map<String, Object> values = new HashMap<>();
+ List<UserSelector> userSelectors;
+ List<String> userApprovalList;
+ EquipmentTransferStatusEnum status = EquipmentTransferStatusEnum.getInstance(entity.getTransferStatus());
+ switch (status) {
+ case WAIT_USE_LEADER_CHECK:
+ // 浣跨敤鍗曚綅棰嗗瀹℃壒缁撴潫
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getUseLeaderApprovalComment());
+ values.put("comment", request.getUseLeaderApprovalComment());
+ if (CommonConstant.APPROVED.equals(request.getUseLeaderApprovalDealType())) {
+ // 閫氳繃
+ values.put("approvalDealType", request.getUseLeaderApprovalDealType());
+ // 鑾峰彇涓嬩竴姝ュ鎵逛汉
+ userSelectors = sysUserService.selectOperatorList(entity.getNewDepartId(), BusinessCodeConst.PCR0008);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("鏈垎閰嶈皟鍏ュ崟浣嶉瀵硷紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ } else {
+ // 椹冲洖
+ values.put("approvalDealType", request.getUseLeaderApprovalDealType());
+ }
+ request.setComment("浣跨敤鍗曚綅棰嗗瀹℃壒缁撴潫");
+ break;
+ case WAIT_TRANSFER_LEADER_CHECK:
+ // 璋冨叆鍗曚綅棰嗗瀹℃壒缁撴潫
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getTransferLeaderApprovalComment());
+ values.put("comment", request.getTransferLeaderApprovalComment());
+ if (CommonConstant.APPROVED.equals(request.getTransferLeaderApprovalDealType())) {
+ // 閫氳繃
+ values.put("approvalDealType", request.getTransferLeaderApprovalDealType());
+ // 鑾峰彇涓嬩竴姝ュ鎵逛汉
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0006);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰鏈哄姩鍔烇紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ } else {
+ // 椹冲洖
+ values.put("approvalDealType", request.getTransferLeaderApprovalDealType());
+ }
+ request.setComment("璋冨叆鍗曚綅棰嗗瀹℃壒缁撴潫");
+ break;
+ case WAIT_EXTERNAL_CONFIRM:
+ // 鏈哄姩鍔炵‘璁ょ粨鏉�
+ values.put("dataId", entity.getId());
+ values.put("organization", "鏈哄姩鍔炵‘璁ょ粨鏉�");
+ values.put("comment", "鏈哄姩鍔炵‘璁ょ粨鏉�");
+ if (CommonConstant.YN_1.equals(request.getCompanyLeaderCheck())) {
+ // 闇�瑕�
+ values.put("confirmation", request.getCompanyLeaderCheck());
+ // 娴佺▼杞埌鍏徃棰嗗瀹℃壒
+ // 鑾峰彇涓嬩竴姝ュ鎵逛汉
+ userSelectors = sysUserService.selectOperatorList(BusinessCodeConst.PCR0009);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰鍏徃棰嗗锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ } else {
+ values.put("confirmation", request.getCompanyLeaderCheck());
+ }
+ request.setComment("鏈哄姩鍔炵‘璁ょ粨鏉�");
+ break;
+ case WAIT_COMPANY_LEADER_CHECK:
+ // 鍏徃棰嗗瀹℃壒缁撴潫
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getCompanyLeaderApprovalComment());
+ values.put("comment", request.getCompanyLeaderApprovalComment());
+ request.setComment("鍏徃棰嗗瀹℃壒缁撴潫");
+ break;
+ }
+ request.setValues(values);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean editTransfer(EamEquipmentTransfer request) {
+ EamEquipmentTransfer entity = equipmentTransferMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瑕佺紪杈戠殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!EquipmentSealUpStatusEnum.WAIT_SUBMIT.name().equals(entity.getTransferStatus())) {
+ throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
+ }
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫鍊熺敤璁板綍锛�");
+ }
+ UpdateWrapper<EamEquipmentTransfer> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("equipment_id", request.getEquipmentId());
+ updateWrapper.set("remark", request.getRemark());
+ updateWrapper.set("transfer_reason", request.getTransferReason());
+ updateWrapper.set("old_depart_id", equipment.getOrgId());
+ updateWrapper.set("new_depart_id", request.getNewDepartId());
+ updateWrapper.eq("id", request.getId());
+ updateWrapper.eq("report_user", sysUser.getUsername());
+ return super.update(updateWrapper);
+ }
+
+ @Override
+ public void afterFlowHandle(FlowMyBusiness business) {
+ business.getTaskNameId();//鎺ヤ笅鏉ュ鎵圭殑鑺傜偣
+ business.getValues();//鍓嶇浼犺繘鏉ョ殑鍙傛暟
+ business.getActStatus();
+ }
+
+ @Override
+ public Object getBusinessDataById(String dataId) {
+ return this.getById(dataId);
+ }
+
+ @Override
+ public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
+ return null;
+ }
+
+ @Override
+ public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
+ //涓氬姟鏄惁骞查娴佺▼锛屼笟鍔″共棰勶紝娴佺▼骞查锛屾寚瀹氫汉鍛樿繘琛屽鐞�
+ //鑾峰彇涓嬩竴姝ュ鐞嗕汉
+ Object object = values.get("NextAssignee");
+ return (List<String>) object;
+ }
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁姝ゆ潈闄�
+ *
+ * @param flowMyBusiness
+ * @param user
+ * @return
+ */
+ private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
+ List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
+ return todoUsers != null && todoUsers.contains(user.getUsername());
+ }
+
+ private boolean claimTask(String taskId, LoginUser user) {
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ if (task == null) {
+ return false;
+ }
+ if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
+ return false;
+ }
+ taskService.claim(taskId, user.getUsername());
+ return true;
+ }
}
--
Gitblit v1.9.3