修改逻辑

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

@@ -550,6 +550,9 @@ public class CommonServiceImpl implements ICommonService {
 
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
+            if (submitType.equals("1")) {
+                jsonObject.put("submit", Boolean.TRUE);
+            }
             jgUseRegistrationServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.GZBG.getBusinessCode())) {
             //兼容业务逻辑代码

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

@@ -286,15 +286,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 params.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
                 TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
                 // 创建新的代办
-                TaskModelDto taskModelDto = new TaskModelDto();
-                BeanUtils.copyProperties(taskV2Model, taskModelDto);
-                taskModelDto.setModel(jgUseRegistration);
-                taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
-                taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
-                commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
+                if (!ObjectUtils.isEmpty(taskV2Model)){
+                    TaskModelDto taskModelDto = new TaskModelDto();
+                    BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                    taskModelDto.setModel(jgUseRegistration);
+                    taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
+                    taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                    taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                    taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                    taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                    commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
+                }else {
+                    workflowResultDto.setInstanceId(jgUseRegistration.getInstanceId());
+                    buildTask(jgUseRegistration, workflowResultDto);
+                }
+
             }
 
         } else {
@@ -476,10 +482,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
         jgUseRegistration.setNextExecuteIds(roles);
         this.update(jgUseRegistration, lambda);
-
-        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgUseRegistration));
-        jsonObject.put("nextTaskId", jgUseRegistration.getNextTaskId());
-        jsonObject.put("nextExecuteUser", jgUseRegistration.getNextExecuteIds());
+        LambdaQueryWrapper<JgUseRegistration> queryWrapper = new QueryWrapper<JgUseRegistration>().lambda();
+        queryWrapper.eq(JgUseRegistration::getInstanceId, instanceId);
+        JgUseRegistration data = this.baseMapper.selectOne(queryWrapper);
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
+        jsonObject.put("nextTaskId", data.getNextTaskId());
+        jsonObject.put("nextExecuteUser", data.getNextExecuteIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
         // 撤回删除代办
         commonServiceImpl.rollbackTask(instanceId, jsonObject);