fix（设备注销）:流程执行丢失设备种类问题

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgScrapCancelController.java

@@ -78,7 +78,7 @@ public class JgScrapCancelController extends BaseController {
         jgScrapCancelInfo.remove("SEQUENCE_NBR");
         JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgScrapCancelInfo), JgScrapCancelDto.class);
 
-        jgScrapCancelService.flowExecute(Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())), jgScrapCancelDto.getInstanceId(), String.valueOf(map.get("operate")), String.valueOf(map.get("opinion")));
+        jgScrapCancelService.flowExecute(jgScrapCancelDto.getEquList(), Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())), jgScrapCancelDto.getInstanceId(), String.valueOf(map.get("operate")), String.valueOf(map.get("opinion")));
         return ResponseHelper.buildResponse("ok");
     }
 

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

@@ -581,7 +581,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     @Transactional
-    public void flowExecute(Long id, String instanceId, String operate, String comment) {
+    public void flowExecute(String equList, Long id, String instanceId, String operate, String comment) {
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
         String taskId = jgScrapCancel.getNextTaskId();
         //组装信息
@@ -600,17 +600,18 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         //执行流程
         ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
         // 更新下一步执行人、创建待办
-        updateExecuteIds(instanceId, id, operate, processTaskDTO);
+        updateExecuteIds(equList, instanceId, id, operate, processTaskDTO);
     }
 
 
-    public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate, ProcessTaskDTO processTaskDTO) {
+    public void updateExecuteIds(String equList, String instanceId, Long sequenceNbr, String operate, ProcessTaskDTO processTaskDTO) {
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
         String taskName = "";
         String nextTaskId = "";
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(sequenceNbr);
+        jgScrapCancel.setEquList(equList);
         if (processTaskDTO != null && processTaskDTO.getNextTask() != null && !processTaskDTO.getNextTask().isEmpty()) {
             taskCode = processTaskDTO.getNextTask().get(0).getKey();
             taskName = processTaskDTO.getNextTask().get(0).getName();