Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -391,7 +391,11 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         jgChangeRegistrationName.setNextTaskId(nextTaskId);
         this.update(jgChangeRegistrationName, lambda);
         // 删除待办
-        commonService.rollbackTask(instanceId);
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationName));
+        jsonObject.put("nextTaskId", jgChangeRegistrationName.getNextTaskId());
+        jsonObject.put("nextExecuteUser", jgChangeRegistrationName.getNextExecutorIds());
+        jsonObject.put("taskType",BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
+        commonService.rollbackTask(instanceId, 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/JgTransferNoticeServiceImpl.java

@@ -584,7 +584,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
         jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         jgTransferNoticeMapper.updateById(jgInstallationNotice);
-        commonService.rollbackTask(jgInstallationNotice.getInstanceId(), JSONObject.parseObject(JSONObject.toJSONString(jgInstallationNotice)));
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgInstallationNotice));
+        jsonObject.put("taskType", BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
+        commonService.rollbackTask(jgInstallationNotice.getInstanceId(), JSON.parseObject(JSON.toJSONString(jgInstallationNotice)));
     }
 
     @Transactional