监管启用停用、维修告知暂存添加下一节点可执行人

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

@@ -25,12 +25,14 @@
                jed.next_executor_ids as nextExecutorIds,
                jed.promoter,
                jed.next_execute_user_ids as nextExecuteUserIds,
-               jed.create_user_id as createUserId
+               jed.create_user_id as createUserId,
+               oi.SUPERVISORY_CODE as supervisoryCode
 
         FROM tzs_jg_enable_disable jed
                  LEFT JOIN tzs_jg_enable_disable_eq jede on jed.sequence_nbr = jede.enable_disable_apply_id
                  LEFT JOIN idx_biz_jg_register_info jri on jede.equ_id = jri.RECORD
                  LEFT JOIN idx_biz_jg_use_info use on jri.RECORD = use.RECORD
+                 LEFT JOIN idx_biz_jg_other_info oi on jri.RECORD = oi.RECORD
         <where>
             <if test="dto.applyNo != null and dto.applyNo != '' ">
               and  jed.apply_no like concat('%',#{dto.applyNo},'%')

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

@@ -180,6 +180,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 businessData(submit, reginParams, jgEnableDisable, map, workflowResultList);
             }
         } else {
+            jgEnableDisable.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
             jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
             jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
             jgEnableDisable.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
@@ -274,6 +275,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 jgEnableDisable.setNextTaskId(workflowResultList.get(0).getNextTaskId());
             }
         } else {
+            jgEnableDisable.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
             jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getName()));
         }
         jgEnableDisable.setEquList(String.valueOf(map.get("equListDesc")));
@@ -397,6 +399,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         if ("0".equals(operate)) {
             if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
                 jgEnableDisable.setPromoter("");
+                jgEnableDisable.setAuditPassDate(new Date());
                 jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getName()));
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();

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

@@ -446,6 +446,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 dto.setInstanceId(workflowResultDtoList.get(i).getInstanceId());
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
             } else {
+                dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
             dto.setEquList(String.valueOf(obj.get("EQU_LIST")));