feat（设备注销）:下一节点可执行人

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

@@ -112,4 +112,7 @@ public class JgScrapCancelDto extends BaseDto {
      */
     private String record;
 
+    @ApiModelProperty(value = "下一节点可执行人")
+    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/JgScrapCancel.java

@@ -142,4 +142,10 @@ public class JgScrapCancel extends BaseEntity {
     @TableField("supervisory_code")
     private String supervisoryCode;
 
+    /**
+     * 下一节点可执行人
+     */
+    @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/JgScrapCancelServiceImpl.java

@@ -236,6 +236,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             if (!StringUtils.isEmpty(instanceId)) {
                 dto.setInstanceId(instanceId);
                 dto.setNextTaskId(nextTaskId);
+                dto.setNextExecuteUserIds(nextUserIds);
                 dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass()));
             } else {
                 dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_SUBMIT.getPass()));
@@ -359,6 +360,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                     jgScrapCancelDto.setInstanceId(instanceId);
                     jgScrapCancelDto.setNextExecuteIds(String.join(",", roleListNext));
                     jgScrapCancelDto.setNextTaskId(nextTaskId);
+                    jgScrapCancelDto.setNextExecuteUserIds(nextUserIds);
                     jgScrapCancelDto.setAuditStatus(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass());
                     // 创建待办
                     JgScrapCancel bean = new JgScrapCancel();
@@ -386,6 +388,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 jgScrapCancelDto.setNextExecuteIds(String.join(",", roleListNext));
                 jgScrapCancelDto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass()));
                 jgScrapCancelDto.setNextTaskId(nextTaskId);
+                // 更新下一步可执行人
+                jgScrapCancelDto.setNextExecuteUserIds(nextUserIds);
                 executeOneStep(jgScrapCancelDto, taskName, nextUserIds, op);
             }
             JgScrapCancel cancel = new JgScrapCancel();
@@ -517,6 +521,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             jgScrapCancel.setAuditStatus(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getRollBack());
         }
         jgScrapCancel.setNextTaskId(workflowResultDto.getNextTaskId());
+        List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
+        // 更新下一步可执行人
+        String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+        jgScrapCancel.setNextExecuteUserIds(nextUserIds);
         jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
         jgScrapCancel.setNextExecuteIds(Objects.isNull(workflowResultDto) ? null : workflowResultDto.getNextExecutorRoleIds());
         this.update(jgScrapCancel, lambda);
@@ -575,6 +583,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             jgScrapCancel.setPromoter(RequestContext.getExeUserId());
             jgScrapCancel.setInstanceId(instanceId);
             jgScrapCancel.setNextTaskId(nextTaskId);
+            // 更新下一步可执行人
+            jgScrapCancel.setNextExecuteUserIds(nextUserIds);
             if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus())) {
                 jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + String.join(",", roleListNext));
             } else {
@@ -595,6 +605,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         } else {
             jgScrapCancel.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgScrapCancel.setAuditPassDate(new Date());
+            // 完成时 下一步骤可执行人清空
+            jgScrapCancel.setNextExecuteUserIds("");
             // 修改业务信息
             updateInfoOther(jgScrapCancel);
             JgScrapCancelDto scrapCancelDto = new JgScrapCancelDto();