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-api/src/main/resources/mapper/JgScrapCancelMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper">
 
     <update id="updatePromoter">
-        UPDATE tzs_jg_scrap_cancel set promoter = null
+        UPDATE tzs_jg_scrap_cancel
+        set promoter = null
         where sequence_nbr = #{id}
     </update>
 
@@ -24,6 +25,9 @@
         ur.remark,
         ur.instance_status as instanceStatus,
         ur.promoter,
+        ur.next_execute_user_ids as nextExecuteUserIds,
+        ur.supervisory_code as supervisoryCode,
+        ur.next_task_id as nextTaskId,
         ifnull(ur.next_execute_ids,'') as nextExecuteIds,
         DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
         use.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
@@ -43,9 +47,9 @@
         LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
         <where>
             and ur.is_delete = 0
-<!--            <if test="dto.equCategory != null and dto.equCategory != ''">-->
-<!--                and jri.EQU_CATEGORY = #{dto.equCategory}-->
-<!--            </if>-->
+            <!--            <if test="dto.equCategory != null and dto.equCategory != ''">-->
+            <!--                and jri.EQU_CATEGORY = #{dto.equCategory}-->
+            <!--            </if>-->
             <if test="dto.auditStatus != null and dto.auditStatus != ''">
                 and ur.audit_status = #{dto.auditStatus}
             </if>
@@ -67,9 +71,9 @@
             <if test="dto.type == 'enterprise' ">
                 and ur.use_unit_code = #{orgCode}
             </if>
-<!--            <if test="dto.type == 'enterprise'">-->
-<!--                AND use.USE_UNIT_CREDIT_CODE = #{orgCode}-->
-<!--            </if>-->
+            <!--            <if test="dto.type == 'enterprise'">-->
+            <!--                AND use.USE_UNIT_CREDIT_CODE = #{orgCode}-->
+            <!--            </if>-->
         </where>
         order by ur.rec_date desc
     </select>
@@ -99,7 +103,6 @@
         where jri.RECORD = #{id}
 
 
-
     </select>
     <select id="getInspectDetail" resultType="java.util.Map">
         SELECT INSPECT_TYPE       as inspectType,
@@ -111,7 +114,8 @@
                INSPECT_REPORT     as inspectReport
         from idx_biz_jg_inspection_detection_info
         where RECORD = #{id}
-        ORDER BY INSPECT_DATE desc LIMIT 1
+        ORDER BY INSPECT_DATE desc
+        LIMIT 1
     </select>
     <select id="getUseDetail" resultType="java.util.Map">
         SELECT USE_UNIT_NAME           as useUnitName,
@@ -126,7 +130,8 @@
                CITY                    as city,
                COUNTY                  as county,
                USE_INNER_CODE          as useInnerCode
-        FROM "idx_biz_jg_use_info"  where RECORD = #{id}
+        FROM "idx_biz_jg_use_info"
+        where RECORD = #{id}
     </select>
 
     <select id="getEquipListPage" resultType="java.util.Map">
@@ -155,8 +160,7 @@
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">
-        select
-            ur.sequence_nbr AS sequenceNbr,
+        select ur.sequence_nbr                AS sequenceNbr,
                ur.instance_id                 as instanceId,
                ur.audit_status                as auditStatus,
                ur.rec_date                    as regDate,
@@ -204,16 +208,14 @@
                ui.CITY_NAME                   AS useUnitCityName,
                ui.COUNTY_NAME                 AS useUnitCountyName,
                ui.ADDRESS                     AS useUnitAddress
-        FROM
-            tzs_jg_scrap_cancel ur
+        FROM tzs_jg_scrap_cancel ur
                  LEFT JOIN tzs_jg_scrap_cancel_eq re ON re.equip_transfer_id = ur.sequence_nbr
                  LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
                  LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
                  LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
                  LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
                  LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
-        WHERE
-            ur.sequence_nbr = #{sequenceNbr}
+        WHERE ur.sequence_nbr = #{sequenceNbr}
         LIMIT 1
     </select>
 </mapper>

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();