安装告知和移装告知 下一步执行人IDS字段添加并赋值

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

@@ -260,4 +260,8 @@ public class JgInstallationNoticeDto extends BaseDto {
 
     private String factoryNum;
 
+
+    @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/dto/JgTransferNoticeDto.java

@@ -224,4 +224,8 @@ public class JgTransferNoticeDto extends BaseDto {
 
     private String equList;
 
+
+    @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/JgInstallationNotice.java

@@ -417,11 +417,13 @@ public class JgInstallationNotice extends BaseEntity {
     /**
      * 设备出场编号
      */
-//    @TableField("\"factory_num\"")
-            @TableField(exist = false)
+    @TableField(exist = false)
     private String factoryNum;
 
-//    @TableField("\"create_user_name\"")
-//    private String nextExecuteUserIds;
+    /**
+     * 下一节点可执行人
+     */
+    @TableField("\"next_execute_user_ids\"")
+    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/JgTransferNotice.java

@@ -313,4 +313,11 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(exist = false)
     private String equList;
 
+    /**
+     * 下一节点可执行人
+     */
+    @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/JgInstallationNoticeServiceImpl.java

@@ -251,6 +251,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 }
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 notice.setInstanceId(workflowResultDto.getInstanceId());
@@ -285,6 +286,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 }
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 this.updateById(notice);
@@ -590,6 +592,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             dto.setNoticeDate(new Date());
             if(SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(workflowResultList.get(i).getNextExecutorRoleIds());
+                dto.setNextExecuteUserIds(workflowResultList.get(i).getNextExecutorUserIds());
                 dto.setInstanceStatus(workflowResultList.get(i).getNextExecutorRoleIds() + "," + workflowResultList.get(i).getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
@@ -739,6 +742,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         jgInstallationNotice.setPromoter("");
         jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+        jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
         jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         this.updateById(jgInstallationNotice);
@@ -856,6 +860,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
             } else {
                 jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+                jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 if (!ObjectUtils.isEmpty(jgInstallationNotice.getInstanceStatus())) {
                     jgInstallationNotice.setInstanceStatus(jgInstallationNotice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
                 } else {

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

@@ -283,6 +283,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 }
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 notice.setInstanceId(workflowResultDto.getInstanceId());
@@ -316,6 +317,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 }
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 jgTransferNoticeMapper.updateById(notice);
@@ -463,6 +465,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             dto.setNoticeDate(new Date());
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(workflowResultList.get(i).getNextExecutorRoleIds());
+                dto.setNextExecuteUserIds(workflowResultList.get(i).getNextExecutorUserIds());
                 dto.setInstanceStatus(workflowResultList.get(i).getNextExecutorRoleIds() + "," + workflowResultList.get(i).getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
@@ -636,6 +639,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         jgInstallationNotice.setPromoter("");
         jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+        jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
         jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         jgTransferNoticeMapper.updateById(jgInstallationNotice);
@@ -691,6 +695,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 taskV2Model = commonService.updateTaskModel(taskMap);
             } else {
                 jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+                jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 if (!ObjectUtils.isEmpty(jgTransferNotice.getInstanceStatus())) {
                     jgTransferNotice.setInstanceStatus(jgTransferNotice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
                 } else {