优化：移装变更登记，代办撤回报错的问题

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

@@ -407,7 +407,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         jgTransfer.setNextExecutorIds(role);
         this.update(jgTransfer, lambda);
         //待办 撤回
-        commonService.rollbackTask(instanceId);
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgTransfer));
+        jsonObject.put("nextTaskId", jgTransfer.getNextTaskId());
+        jsonObject.put("nextExecuteUser", jgTransfer.getNextExecutorIds());
+        jsonObject.put("taskType",BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
+        commonService.rollbackTask(instanceId, JSON.parseObject(JSON.toJSONString(jgTransfer)));
     }
 
 
@@ -643,13 +647,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 jgChangeRegistrationTransfer.setInstanceStatus(role);
             }
 
-//            if (!ObjectUtils.isEmpty(jgChangeRegistrationTransfer.getExecuteSequence())) {
-//                jgChangeRegistrationTransfer.setExecuteSequence(jgChangeRegistrationTransfer.getExecuteSequence() + "," + role);
-//
-//            } else {
-//                jgChangeRegistrationTransfer.setExecuteSequence(role);
-//            }
-
             if ("0".equals(operate)) {
                 // 通过操作
                 jgChangeRegistrationTransfer.setPromoter(reginParams.getUserModel().getUserId());
@@ -665,8 +662,15 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             if (updateTodoAndCreate) {
                 // 上个代办改为已办
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("taskStatus", commonService.getDictionaryCodeByName(jgChangeRegistrationTransfer.getStatus()));
-                map.put("taskStatusLabel", jgChangeRegistrationTransfer.getStatus());
+                if("0".equals(operate)){
+                    map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+                    map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+                }else {
+                    map.put("taskStatus", FlowStatusEnum.REJECTED.getCode());
+                    map.put("taskStatusLabel", FlowStatusEnum.REJECTED.getName());
+                }
+                map.put("flowStatus", commonService.getDictionaryCodeByName(jgChangeRegistrationTransfer.getStatus()));
+                map.put("flowStatusLabel", jgChangeRegistrationTransfer.getStatus());
                 map.put("relationId", jgChangeRegistrationTransfer.getInstanceId());
                 TaskV2Model taskV2Model = commonService.updateTaskModel(map);
                 TaskModelDto taskModelDto = new TaskModelDto();
@@ -690,6 +694,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             HashMap<String, Object> map = new HashMap<>();
             map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
             map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+            map.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+            map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             map.put("relationId", jgChangeRegistrationTransfer.getInstanceId());
             TaskV2Model taskV2Model = commonService.updateTaskModel(map);