优化：移装变更流程bug

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

@@ -633,8 +633,8 @@ public class CommonServiceImpl implements ICommonService {
             }
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
-                if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) &&obj.getTaskType().equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) &&
-                        !obj.getFlowStatus().toString().equals("16723") && map.get("pageType").equals("edit")) {
+                if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) &&BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode().equals(obj.getTaskType()) &&
+                        !"16723".equals(obj.getFlowStatus().toString()) && map.get("pageType").equals("edit")) {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
                     break;
                 }else if (map.get("type").equals(obj.getTaskType()) && map.get("pageType").equals("look")) {

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

@@ -188,7 +188,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 oldHistory = jgRegistrationHistoryService.getDteailByRecord(oldTransferEq.getEquId(), oldTransfer.getApplyNo());
                 useInfo = idxBizJgUseInfoService.getOneData(oldTransferEq.getEquId());
             }
-        }else {
+        } else {
             //查询申请单号
             ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(tableData.get("businessCode"))), 1);
             if (!result.getResult().isEmpty()) {
@@ -356,12 +356,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             //执行流程
             ProcessTaskDTO complete = icmWorkflowService.complete(taskId, dto);
             workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
-
+            // 更新下一步执行人
+            this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        // 更新下一步执行人
-        this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
     }
 
     /**
@@ -380,7 +379,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         WorkflowResultDto workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(processTask)).get(0);
         String taskCode = "";
         String role = "";
-        if(!ValidationUtil.isEmpty(workflowResult)){
+        if (!ValidationUtil.isEmpty(workflowResult)) {
             taskCode = Optional.ofNullable(workflowResult.getNextTaskCode()).orElse("");
             role = Optional.ofNullable(workflowResult.getNextExecutorRoleIds()).orElse("");
             jgTransfer.setNextTaskId(workflowResult.getNextTaskId());
@@ -395,12 +394,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         jgTransfer.setNextExecutorIds(role);
         this.update(jgTransfer, lambda);
         //待办 撤回
-        JgChangeRegistrationTransfer data = this.baseMapper.selectOne(lambda);
-        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
-        jsonObject.put("nextTaskId", data.getNextTaskId());
-        jsonObject.put("nextExecuteUser", data.getNextExecutorIds());
-        jsonObject.put("taskType",BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
-        commonService.rollbackTask(instanceId, JSON.parseObject(JSON.toJSONString(jgTransfer)));
+//        JgChangeRegistrationTransfer data = this.baseMapper.selectOne(lambda);
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgTransfer));
+        jsonObject.put("flowStatus", commonService.getDictionaryCodeByName(jgTransfer.getAuditStatus()));
+        jsonObject.put("flowStatusLabel", jgTransfer.getAuditStatus());
+        jsonObject.put("nextTaskId", jgTransfer.getNextTaskId());
+        jsonObject.put("nextExecuteUser", jgTransfer.getNextExecutorIds());
+        jsonObject.put("taskType", BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
+        commonService.rollbackTask(instanceId, jsonObject);
     }
 
 
@@ -654,27 +655,32 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             if (updateTodoAndCreate) {
                 // 上个代办改为已办
                 HashMap<String, Object> map = new HashMap<>();
-                if("0".equals(operate)){
+                if ("0".equals(operate)) {
                     map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
                     map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-                }else {
+                } 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();
-                BeanUtils.copyProperties(taskV2Model, taskModelDto);
-                // 创建新的代办
-                taskModelDto.setModel(jgChangeRegistrationTransfer);
-                taskModelDto.setTaskName(workflowResult.getNextTaskName());
-                taskModelDto.setExecuteUserIds(workflowResult.getNextExecutorUserIds());
-                taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                taskModelDto.setNextExecuteUser(workflowResult.getNextExecutorRoleIds());
-                commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                TaskV2Model taskV2Model = commonService.updateTaskModelNew(map);
+                if (!ValidationUtil.isEmpty(taskV2Model)) {
+                    TaskModelDto taskModelDto = new TaskModelDto();
+                    BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                    // 创建新的代办
+                    taskModelDto.setModel(jgChangeRegistrationTransfer);
+                    taskModelDto.setTaskName(workflowResult.getNextTaskName());
+                    taskModelDto.setExecuteUserIds(workflowResult.getNextExecutorUserIds());
+                    taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                    taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                    taskModelDto.setNextExecuteUser(workflowResult.getNextExecutorRoleIds());
+                    taskModelDto.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
+                    taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
+                    taskModelDto.setRelationId(instanceId);
+                    commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                }
             }
 
         } else {