修改待办

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

@@ -654,7 +654,7 @@ public class CommonServiceImpl implements ICommonService {
      * 待办编辑接口
      * 参数
      * taskStatus
-     * taskStatusLabel 操作名称  1驳回 2通过 3重新提交
+     * taskStatusLabel 操作名称  6614驳回 6616已完成 6612待受理
      * flowStatusLabel  任务状态枚举code
      * 流程实例id  instanceId
      * flowCode 任务id

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

@@ -282,8 +282,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 params.put("relationId", jgUseRegistration.getInstanceId());
                 params.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
                 params.put("flowStatusLabel", jgUseRegistration.getStatus());
-                params.put("taskStatus", operate.equals("0") ? "2" : "1");
-                params.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+                params.put("taskStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
+                params.put("taskStatusLabel",jgUseRegistration.getStatus());
                 TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
                 // 创建新的代办
                 if (!ObjectUtils.isEmpty(taskV2Model)){
@@ -292,7 +292,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     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));
@@ -318,7 +317,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             params.put("relationId", jgUseRegistration.getInstanceId());
             params.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
             params.put("flowStatusLabel", jgUseRegistration.getStatus());
-            params.put("taskStatus", operate.equals("0") ? "2" : "1");
+            params.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
             params.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             commonServiceImpl.updateTaskModel(params);
         }