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

@@ -414,7 +414,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             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);
         }
     }

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

@@ -667,14 +667,12 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             notice.setNextTaskId(workflowResultDto.getNextTaskId());
             baseMapper.updateById(notice);
 
-            commonService.rollbackTask(notice.getInstanceId(), new JSONObject(MapBuilder.<String, Object>create()
-                    .put("nextTaskId", notice.getNextTaskId())
-                    .put("nextExecuteUser", notice.getNextExecuteIds())
-                    .put("taskType", BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode())
-                    .put("flowStatus", FlowStatusEnum.ROLLBACK.getCode())
-                    .put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName())
-                    .put("pageType", "edit")
-                    .build()));
+            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(notice));
+            jsonObject.put("nextExecuteUser", notice.getNextExecuteIds());
+            jsonObject.put("taskType", BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode());
+            jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
+            jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
+            commonService.rollbackTask(notice.getInstanceId(), jsonObject);
         }
     }
 
@@ -751,6 +749,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             jgReformNotice.setSupervisoryCode(dto.getSupervisoryCode());
             jgReformNotice.setEquList(dto.getEquList());
             jgReformNotice.setNextTaskId(workflowResultDto.getNextTaskId());
+            jgReformNotice.setInstanceId(workflowResultDto.getInstanceId());
+
             // 上个代办改为驳回
             taskV2Model = this.updateLastTodo(jgReformNotice, FlowStatusEnum.REJECTED);
             this.createNewTodo(jgReformNotice, workflowResultDto, taskV2Model, FlowStatusEnum.TO_BE_SUBMITTED);