From 0a19d4923b0a048aee0cda91c37f25bc6e140d54 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 16 七月 2025 21:01:24 +0800
Subject: [PATCH] 修改接收字段

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java |  456 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 452 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
index 774fecb..513ba52 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java
@@ -1,19 +1,467 @@
 package org.jeecg.modules.eam.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+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.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.TranslateDictTextUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.constant.*;
+import org.jeecg.modules.eam.entity.EamBaseHFCode;
+import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
 import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
 import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderChangeMapper;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeQuery;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeRequest;
+import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
 import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderChangeService;
+import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
+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.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactoryUser;
+import org.jeecg.modules.system.service.IBaseFactoryService;
+import org.jeecg.modules.system.service.IBaseFactoryUserService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+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 java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�
  * @Author: jeecg-boot
- * @Date:   2025-07-09
+ * @Date: 2025-07-09
  * @Version: V1.0
  */
-@Service
-public class EamTechnicalStatusEvaluationOrderChangeServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderChangeMapper, EamTechnicalStatusEvaluationOrderChange> implements IEamTechnicalStatusEvaluationOrderChangeService {
+@Service("IEamTechnicalStatusEvaluationOrderChangeService")
+public class EamTechnicalStatusEvaluationOrderChangeServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderChangeMapper, EamTechnicalStatusEvaluationOrderChange> implements IEamTechnicalStatusEvaluationOrderChangeService, FlowCallBackServiceI {
+    @Autowired
+    private IBaseFactoryUserService baseFactoryUserService;
+    @Autowired
+    private IBaseFactoryService baseFactoryService;
+    @Autowired
+    private IEamTechnicalStatusEvaluationOrderService evaluationOrderService;
+    @Autowired
+    private IEamEquipmentService equipmentService;
+    @Autowired
+    private ISysBusinessCodeRuleService businessCodeRuleService;
+    @Autowired
+    private IEamBaseHFCodeService hfCodeService;
+    @Autowired
+    private FlowCommonService flowCommonService;
+    @Autowired
+    private IFlowDefinitionService flowDefinitionService;
+    @Autowired
+    private IFlowMyBusinessService flowMyBusinessService;
+    @Autowired
+    private IFlowTaskService flowTaskService;
+    @Autowired
+    private TranslateDictTextUtils translateDictTextUtils;
+    @Autowired
+    private ISysUserService sysUserService;
 
+
+    @Override
+    public IPage<EamTechnicalStatusEvaluationOrderChange> queryPageList(Page<EamTechnicalStatusEvaluationOrderChange> page, EamTechnicalStatusEvaluationOrderChangeQuery query) {
+        QueryWrapper<EamTechnicalStatusEvaluationOrderChange> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ems.del_flag", CommonConstant.DEL_FLAG_0);
+        //鐢ㄦ埛鏁版嵁鏉冮檺
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (sysUser == null) {
+            return page;
+        }
+        if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+            //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+            List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+            queryWrapper.in("e.equipment_code", equipArr);
+        } else {
+            //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
+            List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.
+                    list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId()));
+            if (!CollectionUtils.isEmpty(baseFactoryUserList)) {
+                Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+                Set<String> factoryCodeList = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+                queryWrapper.in("e.factory_org_code", factoryCodeList);
+            } else {
+                return page;
+            }
+        }
+        if (query != null) {
+            //缂栫爜 妯＄硦鏌ヨ
+            if (StringUtils.isNotBlank(query.getChangeOrderNum())) {
+                queryWrapper.like("ems.change_order_num", query.getChangeOrderNum());
+            }
+            //璁惧
+            if (StringUtils.isNotBlank(query.getEquipmentId())) {
+                queryWrapper.eq("ems.equipment_id", query.getEquipmentId());
+            }
+
+            //淇濆吇鍒嗙被
+            if (StringUtils.isNotBlank(query.getChangeStatus())) {
+                queryWrapper.eq("ems.change_status", query.getChangeStatus());
+            }
+            if (query.getDateBegin() != null && query.getDateEnd() != null) {
+                queryWrapper.between("ems.apply_date", query.getDateBegin(), query.getDateEnd());
+            }
+            //鎺掑簭
+            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("ems." + oConvertUtils.camelToUnderline(column));
+                } else {
+                    queryWrapper.orderByDesc("ems." + oConvertUtils.camelToUnderline(column));
+                }
+            } else {
+                queryWrapper.orderByDesc("ems.create_time");
+            }
+        } else {
+            queryWrapper.orderByDesc("ems.create_time");
+        }
+        return this.getBaseMapper().queryPageList(page, queryWrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean addTechnicalStatusEvaluationOrderChange(EamTechnicalStatusEvaluationOrderChange request) {
+        //鏌ヨ宸ュ崟
+        EamTechnicalStatusEvaluationOrder order = evaluationOrderService.getById(request.getOrderId());
+        if (order == null) {
+            throw new JeecgBootException("閴村畾宸ュ崟涓嶅瓨鍦紝鎿嶄綔澶辫触锛�");
+        }
+        //鏌ヨ璁惧
+        EamEquipment equipment = equipmentService.getById(request.getEquipmentId());
+        if (equipment == null) {
+            throw new JeecgBootException("璁惧淇℃伅涓嶅瓨鍦紝鎿嶄綔澶辫触锛�");
+        }
+        //鐢ㄦ埛鏁版嵁鏉冮檺
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (sysUser == null) {
+            throw new JeecgBootException("鐧诲綍鐢ㄦ埛淇℃伅涓虹┖锛屾搷浣滃け璐ワ紒");
+        }
+        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CHANG_CODE_RULE);
+        request.setChangeOrderNum(codeSeq);
+        request.setId(null);
+        request.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.WAIT_SUBMIT.name());
+        request.setDelFlag(CommonConstant.DEL_FLAG_0);
+        request.setApplicant(sysUser.getUsername());
+        request.setApplyDate(new Date());
+        request.setFactoryOrgCode(equipment.getFactoryOrgCode());
+        //鎶�鏈姸鎬侀壌瀹氳〃
+        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_ORDER_CHANG.name());
+        if (eamBaseHFCode == null) {
+            throw new JeecgBootException("鏈厤缃妧鏈姸鎬侀壌瀹氬彉鏇寸殑HF缂栫爜锛屾坊鍔犲け璐ワ紒");
+        }
+        request.setHfCode(eamBaseHFCode.getHfCode());
+        this.getBaseMapper().insert(request);
+        boolean b = evaluationOrderService.updateEvaluationStatus(request.getOrderId(), TechnicalStatusEvaluationOrderStatusEnum.CHANGING.name());
+        if (!b) {
+            throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氬伐鍗曠姸鎬佸彉鏇村け璐ワ紝鏃犳硶鍙樻洿锛�");
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean editTechnicalStatusEvaluationOrderChange(EamTechnicalStatusEvaluationOrderChange request) {
+        EamTechnicalStatusEvaluationOrderChange entity = this.getBaseMapper().selectById(request.getId());
+        if(entity == null) {
+            throw new JeecgBootException("缂栬緫鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+        }
+        if(!TechnicalStatusEvaluationOrderChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
+            throw new JeecgBootException("鍙湁寰呮彁浜ょ姸鎬佹墠鍙紪杈戯紒");
+        }
+        entity.setApplyReason(request.getApplyReason());
+        entity.setDeferredEvaluationDate(request.getDeferredEvaluationDate());
+        this.getBaseMapper().updateById(entity);
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean submit(String id) {
+        EamTechnicalStatusEvaluationOrderChange entity = this.getBaseMapper().selectById(id);
+        if (entity == null) {
+            throw new JeecgBootException("瑕佹彁浜ょ殑宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+        }
+        if (!TechnicalStatusEvaluationOrderChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
+            throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囨彁浜わ紒");
+        }
+        EamTechnicalStatusEvaluationOrder order = evaluationOrderService.getById(entity.getOrderId());
+        if(order == null) {
+            throw new JeecgBootException("瑕佸彉鏇寸殑鎶�鏈姸鎬侀壌瀹氬伐鍗曚笉瀛樺湪锛岃鍒锋柊閲嶈瘯锛�");
+        }
+        EamEquipment equipment = equipmentService.getById(entity.getEquipmentId());
+        if (equipment == null) {
+            throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
+        }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if(sysUser == null || !sysUser.getUsername().equals(entity.getApplicant())) {
+            throw new JeecgBootException("涓嶆槸鏈汉锛屼笉鑳芥彁浜ゆ宸ュ崟锛�");
+        }
+        entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.EQUIPMENT_MANAGER_SIGNING.name());
+        //鏌ヨ涓嬬骇瀹℃壒浜哄憳
+        List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0011);
+        if (CollectionUtil.isEmpty(userSelectors)) {
+            throw new JeecgBootException("璁惧鏈垎閰嶇粰浣跨敤鍗曚綅涓荤瀹ょ骇棰嗗锛屾棤娉曟彁浜わ紒");
+        }
+        List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+        //鏇存柊瀹炰綋
+        this.getBaseMapper().updateById(entity);
+        //鍚姩娴佺▼
+        flowCommonService.initActBusiness("宸ュ崟鍙�: " + entity.getChangeOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";瀹夎浣嶇疆" + equipment.getInstallationPosition(),
+                entity.getId(), "IEamTechnicalStatusEvaluationOrderChangeService", "evaluation_order_change_process", null);
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("dataId", entity.getId());
+        String applyReasonText = translateDictTextUtils.translateField("applyReason", entity.getApplyReason(), "technical_status_evaluation_order_change_reason");
+        if (StrUtil.isEmpty(applyReasonText)) {
+            variables.put("organization", "鏂板鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇撮粯璁ゅ惎鍔ㄦ祦绋�");
+            variables.put("comment", "鏂板鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇撮粯璁ゅ惎鍔ㄦ祦绋�");
+        } else {
+            variables.put("organization", applyReasonText);
+            variables.put("comment", applyReasonText);
+        }
+        variables.put("proofreading", true);
+        variables.put("NextAssignee", userApprovalList);
+        Result<?> result = flowDefinitionService.startProcessInstanceByKey("evaluation_order_change_process", variables);
+        if(result == null || !result.isSuccess()) {
+            throw new JeecgBootException("鍚姩娴佺▼澶辫触锛�");
+        }
+        //鏇存柊宸ュ崟鐘舵�佷负鍙樻洿涓�
+        order.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.CHANGING.name());
+        boolean b = evaluationOrderService.updateById(order);
+        if(!b) {
+            throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氬伐鍗曠姸鎬佹洿鏂板け璐ワ紒");
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public EamTechnicalStatusEvaluationOrderChange approval(EamTechnicalStatusEvaluationOrderChangeRequest request) {
+        EamTechnicalStatusEvaluationOrderChange entity = this.getBaseMapper().selectById(request.getId());
+        if (entity == null) {
+            throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+        }
+        EamTechnicalStatusEvaluationOrder order = evaluationOrderService.getById(entity.getOrderId());
+        if(order == null) {
+            throw new JeecgBootException("瑕佸彉鏇寸殑鎶�鏈姸鎬侀壌瀹氬伐鍗曚笉瀛樺湪锛岃鍒锋柊閲嶈瘯锛�");
+        }
+        // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (user == null || StrUtil.isBlank(user.getId())) {
+            throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒");
+        }
+        request.setAssignee(user.getUsername());
+        // 鑾峰彇娴佺▼涓氬姟璁板綍
+        FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId(), request.getTaskId());
+        if (flowMyBusiness == null) {
+            throw new JeecgBootException("娴佺▼瀹炰緥涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�");
+        }
+
+        boolean userAuthorized = flowMyBusinessService.isUserAuthorized(flowMyBusiness, user);
+        if (!userAuthorized) {
+            throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔★紝璇峰埛鏂板悗閲嶈瘯锛�");
+        }
+        // 璁ら浠诲姟
+        if (!flowMyBusinessService.claimTask(flowMyBusiness.getTaskId(), user)) {
+            throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒");
+        }
+
+        EamEquipment equipment = equipmentService.getById(entity.getEquipmentId());
+        if (equipment == null) {
+            throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+        }
+
+        TechnicalStatusEvaluationOrderChangeStatusEnum status = TechnicalStatusEvaluationOrderChangeStatusEnum.getInstance(entity.getChangeStatus());
+        if (status == null) {
+            return null;
+        }
+        //娴佺▼鍙橀噺
+        Map<String, Object> values = new HashMap<>();
+        List<String> userApprovalList;
+        List<UserSelector> userSelectors;
+        switch (status) {
+            case EQUIPMENT_MANAGER_SIGNING:
+                //浣跨敤鍗曚綅涓荤瀹ょ骇棰嗗瀹℃牳
+                if(TechnicalStatusEvaluationOrderChangeReasonEnum.PRODUCTION_WORK_ORDER_EXPEDITED.name().equals(request.getApplyReason())) {
+                    //鐢熶骇浠诲姟
+                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0012);
+                    if (CollectionUtil.isEmpty(userSelectors)) {
+                        throw new JeecgBootException("璁惧鏈垎閰嶇粰鐢熶骇鎸囨尌閮ㄥ绾ч瀵硷紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+                    }
+                } else if(TechnicalStatusEvaluationOrderChangeReasonEnum.EQUIPMENT_BREAKDOWN_REPAIR.name().equals(request.getApplyReason())) {
+                    //璁惧鏁呴殰
+                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0013);
+                    if (CollectionUtil.isEmpty(userSelectors)) {
+                        throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨鍖洪暱锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+                    }
+                } else if(TechnicalStatusEvaluationOrderChangeReasonEnum.EQUIPMENT_SCRAPPED.name().equals(request.getApplyReason())) {
+                    //璁惧鎶ュ簾
+                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0014);
+                    if (CollectionUtil.isEmpty(userSelectors)) {
+                        throw new JeecgBootException("璁惧鏈垎閰嶇粰璧勪骇绠＄悊閮紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+                    }
+                } else if(TechnicalStatusEvaluationOrderChangeReasonEnum.EQUIPMENT_MAJOR.name().equals(request.getApplyReason())) {
+                    //璁惧澶т慨
+                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0016);
+                    if (CollectionUtil.isEmpty(userSelectors)) {
+                        throw new JeecgBootException("璁惧鏈垎閰嶇粰杩愮淮鍟嗗姟瀹や富浠伙紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+                    }
+                }else if(TechnicalStatusEvaluationOrderChangeReasonEnum.EQUIPMENT_RELOCATION.name().equals(request.getApplyReason()) || TechnicalStatusEvaluationOrderChangeReasonEnum.EQUIPMENT_RETROFITTING.name().equals(request.getApplyReason())) {
+                    //璁惧鎼縼銆佹敼閫�
+                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0015);
+                    if (CollectionUtil.isEmpty(userSelectors)) {
+                        throw new JeecgBootException("璁惧鏈垎閰嶇粰椤圭洰涓荤閮紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+                    }
+                } else {
+                    throw new JeecgBootException("鍙樻洿鐢宠鍘熷洜鏃犳硶璇嗗埆锛屽鎵瑰け璐ワ紒");
+                }
+                userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+                values.put("dataId", entity.getId());
+                if(StringUtils.isBlank(request.getEquipmentManagerComment())) {
+                    values.put("organization", "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇翠娇鐢ㄥ崟浣嶄富绠″绾ч瀵�");
+                    values.put("comment", "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇翠娇鐢ㄥ崟浣嶄富绠″绾ч瀵�");
+                    request.setComment("鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇翠娇鐢ㄥ崟浣嶄富绠″绾ч瀵�");
+                } else {
+                    values.put("organization", request.getEquipmentManagerComment());
+                    values.put("comment", request.getEquipmentManagerComment());
+                    request.setComment(request.getEquipmentManagerComment());
+                }
+
+                //璁剧疆entity
+                entity.setEquipmentManagerSignature(user.getUsername());
+                entity.setEquipmentManagerSignatureTime(new Date());
+                entity.setEquipmentManagerComment(request.getEquipmentManagerComment());
+                entity.setEquipmentManagerSignatureResult(request.getEquipmentManagerSignatureResult());
+                values.put("departHeaderConfirmFlag", request.getEquipmentManagerSignatureResult());
+                if(BusinessCodeConst.APPROVED.equals(request.getEquipmentManagerSignatureResult())) {
+                    //閫氳繃
+                    entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.DEPART_MANAGER_SIGNING.name());
+                    values.put("NextAssignee", userApprovalList);
+                }else {
+                    //椹冲洖
+                    entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.REJECTED.name());
+                }
+                break;
+            case DEPART_MANAGER_SIGNING:
+                //閮ㄩ棬棰嗗瀹℃牳
+                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0017);
+                if (CollectionUtil.isEmpty(userSelectors)) {
+                    throw new JeecgBootException("璁惧鏈垎閰嶇粰杩愮淮绠＄悊瀹ゅ涓讳换锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+                }
+                userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+                values.put("dataId", entity.getId());
+                if(StringUtils.isBlank(request.getDepartManagerComment())) {
+                    values.put("organization", "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇撮儴闂ㄩ瀵煎鏍�");
+                    values.put("comment", "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇撮儴闂ㄩ瀵煎鏍�");
+                    request.setComment("鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇撮儴闂ㄩ瀵煎鏍�");
+                } else {
+                    values.put("organization", request.getDepartManagerComment());
+                    values.put("comment", request.getDepartManagerComment());
+                    request.setComment(request.getDepartManagerComment());
+                }
+                //璁剧疆entity
+                entity.setDepartManagerSignature(user.getUsername());
+                entity.setDepartManagerSignatureTime(new Date());
+                entity.setDepartManagerSignatureResult(request.getDepartManagerSignatureResult());
+                entity.setDepartManagerComment(request.getDepartManagerComment());
+                if(BusinessCodeConst.APPROVED.equals(request.getDepartManagerSignatureResult())) {
+                    //閫氳繃
+                    entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.PRODUCTION_SUPPORT_SIGNING.name());
+                    values.put("NextAssignee", userApprovalList);
+                }else {
+                    //椹冲洖
+                    entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.REJECTED.name());
+                }
+                break;
+            case PRODUCTION_SUPPORT_SIGNING:
+                //缁翠慨瀹や富浠荤瀛�
+                values.put("dataId", entity.getId());
+                if(StringUtils.isBlank(request.getProductionSupportComment())) {
+                    values.put("organization", "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇寸敓浜т繚闅滈儴瀹℃牳");
+                    values.put("comment", "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇寸敓浜т繚闅滈儴瀹℃牳");
+                    request.setComment("鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇寸敓浜т繚闅滈儴瀹℃牳");
+                } else {
+                    values.put("organization", request.getProductionSupportComment());
+                    values.put("comment", request.getProductionSupportComment());
+                    request.setComment(request.getProductionSupportComment());
+                }
+                //璁剧疆entity
+                entity.setProductionSupportSignature(user.getUsername());
+                entity.setProductionSupportSignatureTime(new Date());
+                entity.setProductionSupportSignatureResult(request.getProductionSupportSignatureResult());
+                entity.setProductionSupportComment(request.getProductionSupportComment());
+                if(BusinessCodeConst.APPROVED.equals(request.getProductionSupportSignatureResult())) {
+                    //閫氳繃
+                    entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.COMPLETED.name());
+                    order.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name());
+                    order.setEvaluationDate(entity.getDeferredEvaluationDate());
+                    evaluationOrderService.updateById(order);
+                }else {
+                    //椹冲洖
+                    entity.setChangeStatus(TechnicalStatusEvaluationOrderChangeStatusEnum.REJECTED.name());
+                }
+                break;
+        }
+        request.setValues(values);
+
+        // 瀹屾垚娴佺▼浠诲姟
+        Result<?> result = flowTaskService.complete(request);
+        if (!result.isSuccess()) {
+            throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
+        }
+        //淇濆瓨宸ュ崟
+        this.getBaseMapper().updateById(entity);
+        return entity;
+    }
+
+    @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;
+    }
 }

--
Gitblit v1.9.3