fix(JG)：改造告知,设备移交代码提交

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/JgEquipTransferServiceImpl.java

@@ -215,7 +215,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .startUserId(taskV2Model.getStartUserId())
                 .startUser(taskV2Model.getStartUser())
                 .startDate(taskV2Model.getStartDate())
-                .pageType("edit")
+                //.pageType("edit")
                 .model(taskMessageDto)
                 .nextExecuteUser(workflowResultDto.getNextExecutorRoleIds())
                 .build();
@@ -297,7 +297,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 transfer.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 transfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 transfer.setNextTaskId(workflowResultDto.getNextTaskId());
-                transfer.setInstanceId(workflowResultDto.getInstanceId());
+                //transfer.setInstanceId(workflowResultDto.getInstanceId());
 
                 updateById(transfer);
                 // 上个代办改为已办
@@ -384,6 +384,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             jgEquipTransfer.setSupervisoryCode(jgEquipTransferDto.getSupervisoryCode());
             jgEquipTransfer.setEquList(jgEquipTransferDto.getEquList());
             jgEquipTransfer.setNextTaskId(workflowResultDto.getNextTaskId());
+            jgEquipTransfer.setInstanceId(workflowResultDto.getInstanceId());
             // 上个代办改为驳回
             taskV2Model = this.updateLastTodo(jgEquipTransfer, FlowStatusEnum.REJECTED);
             this.createNewTodo(jgEquipTransfer, workflowResultDto, taskV2Model, FlowStatusEnum.TO_BE_SUBMITTED);
@@ -408,15 +409,13 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             equipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
             equipTransfer.setNextTaskId(workflowResultDto.getNextTaskId());
             baseMapper.updateById(equipTransfer);
-
-            commonService.rollbackTask(equipTransfer.getInstanceId(), new JSONObject(MapBuilder.<String, Object>create()
-                    //.put("nextTaskId", equipTransfer.getNextTaskId())
-                    .put("nextExecuteUser", equipTransfer.getNextExecuteIds())
-                    .put("taskType", BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
-                    .put("flowStatus", FlowStatusEnum.ROLLBACK.getCode())
-                    .put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName())
-                    //.put("pageType", "edit")
-                    .build()));
+            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(equipTransfer));
+            jsonObject.put("nextExecuteUser", equipTransfer.getNextExecuteIds());
+            jsonObject.put("taskType", BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode());
+            jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
+            jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
+            jsonObject.put("sequenceNbr", equipTransfer.getSequenceNbr());
+            commonService.rollbackTask(equipTransfer.getInstanceId(), jsonObject);
         }
     }
     private String getStringFromMap(Map<String, Object> map, String key) {