维修告知修改

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

@@ -138,7 +138,7 @@ public class JgEnableDisable extends BaseEntity {
     private String nextTaskId;
 
     /**
-     *工作流下一节点任务id
+     * 下一节点可执行人逗号分割
      */
     @TableField(value = "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/JgMaintainNotice.java

@@ -314,6 +314,12 @@ public class JgMaintainNotice extends BaseEntity {
     @TableField("next_execute_ids")
     private String nextExecuteIds;
 
+    /**
+     * 下一节点可执行人逗号分割
+     */
+    @TableField(value = "next_execute_user_ids")
+    private String nextExecuteUserIds;
+
     @TableField(value = "create_user_company_name")
     private String createUserCompanyName;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEnableDisableMapper.xml

@@ -23,7 +23,8 @@
                jed.instance_id as instanceId,
                jed.execute_sequence as executeSequence,
                jed.next_executor_ids as nextExecutorIds,
-               jed.promoter
+               jed.promoter,
+               jed.next_execute_user_ids as nextExecuteUserIds
 
         FROM tzs_jg_enable_disable jed
                  LEFT JOIN tzs_jg_enable_disable_eq jede on jed.sequence_nbr = jede.enable_disable_apply_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/JgMaintainNoticeServiceImpl.java

@@ -186,6 +186,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 } else {
                     notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
                 }
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
@@ -214,6 +215,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 } else {
                     notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
                 }
+                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 notice.setPromoter(RequestContext.getExeUserId());
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
@@ -655,6 +657,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         jgMaintainNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
         jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
         jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
+        jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         updateById(jgMaintainNotice);
 
         // 删除待办
@@ -760,6 +763,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
+        jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         jgMaintainNoticeMapper.updateById(jgMaintainNotice);
     }