fix（设备注销）:流程修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java

@@ -96,7 +96,7 @@ public class JgScrapCancel extends BaseEntity {
     private String receiveOrgName;
 
     /**
-     * 接收机构公司代码
+     * 接收机构公司代码--暂时未用到
      */
     @TableField("receive_company_code")
     private String receiveCompanyCode;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgScrapCancelEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
-import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
 
 /**
  * 报废注销设备关系表 Mapper 接口

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -193,7 +193,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             dto.setProcessDefinitionKey("scrapCancelNew");
             dto.setBusinessKey(applyNoList.get(0));
             dto.setCompleteFirstTask(Boolean.TRUE);
-            //下一节点执行人单位（下节点接收机构code）
+            // 下一节点执行人单位（下节点接收机构code）
             dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
             list.add(dto);
 
@@ -314,9 +314,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
                 lambda.eq(JgScrapCancel::getSequenceNbr, id);
                 JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
-                //删除代办消息
+                // 删除代办消息
                 commonService.deleteTaskModel(String.valueOf(jgScrapCancel.getSequenceNbr()));
-                //更新jgScrapCancel数据
+                // 更新jgScrapCancel数据
                 jgScrapCancel.setIsDelete(true);
                 this.updateById(jgScrapCancel);
             }
@@ -324,6 +324,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op) {
+
         if (Objects.isNull(jgScrapCancelDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -335,7 +336,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             // 更新并提交
             // 发起流程
             if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
-                //未进流程直接发起并执行
+                // 未进流程直接发起并执行
 
                 List<ProcessTaskDTO> processTasks;
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
@@ -367,7 +368,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 createTaskModel(bean, taskName, "1", nextUserIds);
             } else {
                 // 已经在流程中，执行一步
-                ProcessTaskDTO processTaskDTO = submit(jgScrapCancelDto.getNextTaskId());
+                ProcessTaskDTO processTaskDTO = submit(jgScrapCancelDto);
                 String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
                 String taskName = processTaskDTO.getNextTask().get(0).getName();
                 this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -408,7 +409,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 String supervisoryCode = otherInfo.getSupervisoryCode();
                 jgScrapCancelDto.setSupervisoryCode(supervisoryCode);
             }
-            //更新操作
+            // 更新操作
             JgScrapCancel bean = new JgScrapCancel();
             BeanUtils.copyProperties(jgScrapCancelDto, bean);
             bean.setCancelCertificate(JSON.toJSONString(jgScrapCancelDto.getCancelCertificateList()));
@@ -428,9 +429,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         taskV2Model.setTaskDesc("");
         taskV2Model.setTaskContent(this.buildTaskContent(jgScrapCancelDto.getEquList(), jgScrapCancelDto.getSupervisoryCode(), jgScrapCancelDto.getCancelType(), jgScrapCancelDto.getApplyNo()));
         taskV2Model.setTaskName(taskName);
-        taskV2Model.setTaskDesc("");
         taskV2Model.setTaskCode(jgScrapCancelDto.getApplyNo());
-        taskV2Model.setExecuteUserIds(nextUserIds);
         taskV2Model.setRelationId(jgScrapCancelDto.getInstanceId());
         FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
         taskV2Model.setTaskStatus(flowStatusEnum.getCode());
@@ -449,6 +448,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         modelDto.setNextExecuteUser(jgScrapCancelDto.getNextExecuteIds());
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtils.copyProperties(jgScrapCancelDto, taskMessageDto);
+        taskMessageDto.setNextExecuteUserIds(null);
         modelDto.setModel(taskMessageDto);
         modelDto.setPageType(this.getPageTypeForReject(operate, jgScrapCancelDto.getAuditStatus()));
         commonService.buildTaskModel(Collections.singletonList(modelDto));
@@ -490,15 +490,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
     }
 
-    public ProcessTaskDTO submit(String taskId) {
-        //组装信息
+    public ProcessTaskDTO submit(JgScrapCancelDto jgScrapCancelDto) {
+        JgScrapCancel model = this.getById(jgScrapCancelDto.getSequenceNbr());
+        // 组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
-        dto.setTaskId(taskId);
+        dto.setTaskId(jgScrapCancelDto.getNextTaskId());
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", "提交");
+        dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
         dto.setVariable(map);
-        return cmWorkflowService.complete(taskId, dto);
+        return cmWorkflowService.complete(jgScrapCancelDto.getNextTaskId(), dto);
     }
 
     public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
@@ -585,7 +587,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     public void flowExecute(String equList, Long id, String instanceId, String operate, String comment) {
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
         String taskId = jgScrapCancel.getNextTaskId();
-        //组装信息
+        // 组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(taskId);
@@ -596,9 +598,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             map.put("approvalStatus", "提交");
         }
         dto.setVariable(map);
-        //下一节点执行人单位（下节点接收机构code）
+        // 下一节点执行人单位（下节点接收机构code）
         dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, jgScrapCancel));
-        //执行流程
+        // 执行流程
         ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
         // 更新下一步执行人、创建待办
         updateExecuteIds(equList, instanceId, id, operate, processTaskDTO);
@@ -701,8 +703,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         if ("0".equals(operate)) {
             code = jgScrapCancel.getReceiveOrgCode();
         } else {
-            //驳回
-            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getPass().equals(jgScrapCancel.getAuditStatus()) || WorkFlowStatusEnum.CANCEL_RECEIVE.getReject().equals(jgScrapCancel.getAuditStatus()) || WorkFlowStatusEnum.CANCEL_RECEIVE.getRollBack().equals(jgScrapCancel.getAuditStatus())) {
+            // 驳回
+            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getPass().equals(jgScrapCancel.getAuditStatus()) ||
+                    WorkFlowStatusEnum.CANCEL_RECEIVE.getReject().equals(jgScrapCancel.getAuditStatus()) ||
+                    WorkFlowStatusEnum.CANCEL_RECEIVE.getRollBack().equals(jgScrapCancel.getAuditStatus())) {
                 code = jgScrapCancel.getUseUnitCode();
             }
         }