Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -137,6 +137,12 @@ public class JgEnableDisable extends BaseEntity {
     @TableField(value = "next_task_id")
     private String nextTaskId;
 
+    /**
+     *工作流下一节点任务id
+     */
+    @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/JgChangeRegistrationNameMapper.xml

@@ -33,6 +33,7 @@
     ur.use_unit_name as useUnitName,
     ur.new_use_unit_name AS newUseUnitName,
     ur.promoter,
+    ur.create_user_id as createUserId,
     ur.next_executor_ids as nextExecutorIds,
     ur.next_execute_user_ids as nextExecuteUserIds
     from tzs_jg_change_registration_name ur

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

@@ -12,6 +12,7 @@
     <select id="getListPage" resultType="java.util.Map">
         select ur.sequence_nbr as sequenceNbr,
         ur.instance_id as instanceId,
+        ur.create_user_id as createUserId,
         ur.audit_status as auditStatus,
         DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
         DATE_FORMAT(ur.create_date,'%Y-%m-%d') as createDate,

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

@@ -129,6 +129,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             jgEnableDisable.setNextExecutorIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
             jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
             jgEnableDisable.setNextTaskId(workflowResultDto.getNextTaskId());
+            jgEnableDisable.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             this.baseMapper.updateById(jgEnableDisable);
             // 上个代办改为已办
             HashMap<String, Object> map1 = new HashMap<>();
@@ -201,6 +202,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         jgEnableDisable.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
         jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
         jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
+        jgEnableDisable.setNextExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds());
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             jgEnableDisable.setNextExecutorIds(workflowResultList.get(0).getNextExecutorRoleIds());
             jgEnableDisable.setExecuteSequence(workflowResultList.get(0).getNextExecutorRoleIds() + "," + workflowResultList.get(0).getExecutorRoleIds());
@@ -383,6 +385,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
+        jgEnableDisable.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgEnableDisable.setNextTaskId(workflowResultDto.getNextTaskId());
         this.baseMapper.updateById(jgEnableDisable);
 
@@ -426,6 +429,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         jgEnableDisable.setExecuteSequence(workflowResultDto.getNextExecutorRoleIds());
         jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getName()));
         jgEnableDisable.setNextTaskId(workflowResultDto.getNextTaskId());
+        jgEnableDisable.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         updateById(jgEnableDisable);
 
         // 删除待办