维保备案下一节点可执行人

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintenanceContractDto.java

@@ -143,4 +143,8 @@ public class JgMaintenanceContractDto extends BaseDto {
     @TableField(value = "next_task_id")
     private String nextTaskId;
 
+    /**
+     * 下一节点可执行人
+     */
+    private String nextExecuteUserIds;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintenanceContract.java

@@ -253,4 +253,9 @@ public class JgMaintenanceContract extends BaseEntity {
     @TableField(value = "next_task_id")
     private String nextTaskId;
 
+    /**
+     * 下一节点可执行人
+     */
+    @TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
 }

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

@@ -184,7 +184,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         taskV2Model.setTaskDesc("");
         taskV2Model.setTaskContent(this.buildTaskContent(contract));
         taskV2Model.setTaskName(taskName);
-        taskV2Model.setTaskDesc("");
         taskV2Model.setTaskCode(contract.getApplyNo());
         taskV2Model.setExecuteUserIds(nextUserIds);
         taskV2Model.setRelationId(contract.getInstanceId());
@@ -193,9 +192,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         taskV2Model.setTaskStatusLabel(flowStatusEnum.getName());
         taskV2Model.setFlowStatus(this.getTaskStatusByName(contract.getStatus()));
         taskV2Model.setFlowStatusLabel(contract.getStatus());
-        taskV2Model.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
+        taskV2Model.setTaskType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode());
         taskV2Model.setStartUser(contract.getCreateUserName());
-        taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
+        taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName());
         taskV2Model.setStartDate(contract.getCreateDate());
         taskV2Model.setStartUserId(contract.getCreateUserId());
         taskV2Model.setStartUserCompanyName(contract.getUseUnitName());
@@ -231,6 +230,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         contract.setPromoter(RequestContext.getExeUserId());
         contract.setNextExecuteIds(String.join(",", roleListNext));
         contract.setNextTaskId(nextTaskId);
+        List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
+        // 更新下一步可执行人
+        String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+        contract.setNextExecuteUserIds(nextUserIds);
         this.update(contract, lambda);
         // 删除待办
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(contract));
@@ -335,6 +338,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     contract.setInstanceId(instanceId);
                     contract.setNextExecuteIds(String.join(",", roleListNext));
                     contract.setNextTaskId(nextTaskId);
+                    contract.setNextExecuteUserIds(nextUserIds);
                     // 创建待办
                     JgMaintenanceContract bean = new JgMaintenanceContract();
                     BeanUtil.copyProperties(contract, bean);
@@ -361,6 +365,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 contract.setNextExecuteIds(String.join(",", roleListNext));
                 contract.setStatus(String.valueOf(WorkFlowStatusEnum.MAIN_RECEIVE.getPass()));
                 contract.setNextTaskId(nextTaskId);
+                contract.setNextExecuteUserIds(nextUserIds);
                 executeOneStep(contract, taskName, nextUserIds, "0");
             }
         }
@@ -411,6 +416,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             contract.setPromoter(RequestContext.getExeUserId());
             contract.setInstanceId(instanceId);
             contract.setNextTaskId(nextTaskId);
+            // 更新下一步可执行人
+            contract.setNextExecuteUserIds(nextUserIds);
             if (!ObjectUtils.isEmpty(contract.getInstanceStatus())) {
                 contract.setInstanceStatus(contract.getInstanceStatus() + "," + String.join(",", roleListNext));
             } else {
@@ -426,6 +433,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             }
             executeOneStep(contract, taskName, nextUserIds, operate);
         } else {
+            // 完成时 下一步骤可执行人清空
+            contract.setNextExecuteUserIds("");
             contract.setApplyDate(new Date());
             contract.setStatus(taskCode);
             updateTaskModel(contract, operate);
@@ -457,7 +466,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     }
 
     private void createTaskModel(JgMaintenanceContract dto, String taskName, String submitType, String nextUserIds) {
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if ("1".equals(submitType)) {
             TaskModelDto taskModelDto = new TaskModelDto();
             taskModelDto.setFlowCreateDate(dto.getApplyDate());
@@ -469,10 +477,13 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName());
             taskModelDto.setRelationId(dto.getInstanceId());
             taskModelDto.setExecuteUserIds(nextUserIds);
-            taskModelDto.setTaskStatus(this.getTaskCodeByName(dto.getStatus()));
-            taskModelDto.setTaskStatusLabel(dto.getStatus());
+            FlowStatusEnum flowStatusEnum = this.getTaskStatus(submitType);
+            taskModelDto.setTaskStatus(flowStatusEnum.getCode());
+            taskModelDto.setTaskStatusLabel(flowStatusEnum.getName());
+            taskModelDto.setFlowStatus(this.getTaskStatusByName(dto.getStatus()));
+            taskModelDto.setFlowStatusLabel(dto.getStatus());
             taskModelDto.setStartUserId(dto.getCreateUserId());
-            taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
+            taskModelDto.setStartUser(dto.getCreateUserName());
             taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
             taskModelDto.setNextExecuteUser(dto.getNextExecuteIds());
             taskModelDto.setStartDate(dto.getCreateDate());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -57,13 +57,13 @@
     "type": "106",
     "pageType": "look",
     "name": "维保备案",
-    "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&pageType=look&applyStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "106",
     "pageType": "edit",
     "name": "维保备案",
-    "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&pageType=edit&applyStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "107",