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/dto/JgChangeRegistrationNameDto.java

@@ -106,4 +106,9 @@ public class JgChangeRegistrationNameDto extends BaseDto {
     private String nextTaskId;
 
 
+    /**
+     * 下一节点可执行人
+     */
+    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/JgChangeRegistrationName.java

@@ -148,5 +148,10 @@ public class JgChangeRegistrationName extends BaseEntity {
     @TableField("next_task_id")
     private String nextTaskId;
 
+    /**
+     * 下一节点可执行人
+     */
+    @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/JgEquipTransferMapper.xml

@@ -109,9 +109,6 @@
             jet.instance_status AS instanceStatus,
             jet.accept_date AS acceptDate,
             jet.task_name AS taskName,
-            ri.equ_list AS equList,
-            ri.equ_category AS equCategory,
-            ri.equ_define AS equDefine,
             ri.product_name AS productName,
             ri.brand_name AS brandName,
             ri.equ_type AS equType,

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

@@ -175,6 +175,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         if (!StringUtils.isEmpty(instanceId)) {
             dto.setInstanceId(instanceId);
             dto.setNextTaskId(nextTaskId);
+            dto.setNextExecuteUserIds(nextUserIds);
             dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass()));
         } else {
             dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass()));
@@ -276,6 +277,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                     jgChangeRegistrationName.setInstanceId(instanceId);
                     jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
                     jgChangeRegistrationName.setNextTaskId(nextTaskId);
+                    jgChangeRegistrationName.setNextExecuteUserIds(nextUserIds);
                     jgChangeRegistrationName.setAuditStatus(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass());
                     // 创建待办
                     createTaskModel(jgChangeRegistrationName, taskName, "1", nextUserIds);
@@ -301,6 +303,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
                 jgChangeRegistrationName.setAuditStatus(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass());
                 jgChangeRegistrationName.setNextTaskId(nextTaskId);
+                // 更新下一步可执行人
+                jgChangeRegistrationName.setNextExecuteUserIds(nextUserIds);
                 executeOneStep(jgChangeRegistrationName, taskName, nextUserIds, op);
             }
             this.updateById(jgChangeRegistrationName);
@@ -397,6 +401,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         jgChangeRegistrationName.setPromoter(RequestContext.getExeUserId());
         jgChangeRegistrationName.setNextExecutorIds(String.join(",", roleListNext));
         jgChangeRegistrationName.setNextTaskId(nextTaskId);
+        List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
+        // 更新下一步可执行人
+        String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
+        jgChangeRegistrationName.setNextExecuteUserIds(nextUserIds);
         this.update(jgChangeRegistrationName, lambda);
         // 删除待办
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationName));
@@ -453,6 +461,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             jgChangeRegistrationName.setPromoter(RequestContext.getExeUserId());
             jgChangeRegistrationName.setInstanceId(instanceId);
             jgChangeRegistrationName.setNextTaskId(nextTaskId);
+            // 更新下一步可执行人
+            jgChangeRegistrationName.setNextExecuteUserIds(nextUserIds);
             if (!ObjectUtils.isEmpty(jgChangeRegistrationName.getInstanceStatus())) {
                 jgChangeRegistrationName.setInstanceStatus(jgChangeRegistrationName.getInstanceStatus() + "," + String.join(",", roleListNext));
             } else {
@@ -471,6 +481,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         } else {
             jgChangeRegistrationName.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgChangeRegistrationName.setAuditPassDate(new Date());
+            // 完成时 下一步骤可执行人清空
+            jgChangeRegistrationName.setNextExecuteUserIds("");
             // 修改业务信息
             updateInfoOther(jgChangeRegistrationName);
             // 更新代办

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

@@ -239,8 +239,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             oldTransfer.setReceiveOrgName(receiveOrgName);
         }
         //办理状态
-        oldTransfer.setAuditStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
-        oldTransfer.setStatus(UseStatusEnum.SUBMIT.getPass());
+        oldTransfer.setAuditStatus(WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass());
+        oldTransfer.setStatus(WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass());
 
         //es种查询设备信息
         SearchRequest request = new SearchRequest();