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

@@ -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/JgChangeRegistrationReformServiceImpl.java

@@ -231,7 +231,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             dto.setProcessDefinitionKey("renovationRegistrationReviewNew");
             dto.setBusinessKey("submit");
             dto.setCompleteFirstTask(Boolean.TRUE);
-            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
+//            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
             List<ActWorkflowStartDTO> actWorkflowStartDTOList = Arrays.asList(dto);
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             actWorkflowBatchDTO.setProcess(actWorkflowStartDTOList);
@@ -346,7 +346,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);
-            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
+//            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
             //执行流程
             processTaskDTO = iCmWorkflowService.complete(taskId, dto);
         } catch (Exception e) {

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

@@ -234,7 +234,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
                 dto.setCompleteFirstTask(Boolean.TRUE);
-                dto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(notice.getReceiveOrgCreditCode()));
+                //下一节点执行人单位（下节点接收机构code）
+                dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCreditCode());
                 list.add(dto);
                 actWorkflowBatchDTO.setProcess(list);
                 processTaskDTO = iCmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
@@ -268,7 +269,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     commMap.put("approvalStatus", op);
                 }
                 dto.setVariable(commMap);
-                dto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(notice.getReceiveOrgCreditCode()));
+                //下一节点执行人单位（下节点接收机构code）
+                dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCreditCode());
                 processTaskDTO = iCmWorkflowService.complete(notice.getNextTaskId(), dto);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
@@ -488,7 +490,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
 
         // 启动工作流并返回信息
-        List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList, commonMapper.getOrgCodeByCompanyCode(model.getReceiveOrgCreditCode()));
+        List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList, model.getReceiveOrgCreditCode());
 
         List<JgInstallationNotice> list = new ArrayList<>();
         List<JgInstallationNoticeEq> equipList = new ArrayList<>();
@@ -592,7 +594,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
                 dto.setCompleteFirstTask(Boolean.TRUE);
-                dto.setNextExecuteUserOrgCode(receiveOrgCreditCode);
+                dto.setNextExecuteUserCompanyCode(receiveOrgCreditCode);
                 list.add(dto);
             });
             actWorkflowBatchDTO.setProcess(list);
@@ -886,7 +888,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
         workDto.setVariable(commMap);
         workDto.setComment(jgTransferNotice.getProcessAdvice());
-        workDto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(jgTransferNotice.getReceiveOrgCreditCode()));
+        workDto.setNextExecuteUserCompanyCode(jgTransferNotice.getReceiveOrgCreditCode());
         processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);

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()));
@@ -427,6 +429,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 dto.setNextExecuteIds(workflowResultDtoList.get(i).getNextExecutorRoleIds());
                 dto.setInstanceStatus(workflowResultDtoList.get(i).getNextExecutorRoleIds() + "," + workflowResultDtoList.get(i).getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
+                dto.setNextExecuteUserIds(workflowResultDtoList.get(i).getNextExecutorUserIds());
             }
             dto.setEquList(obj.get("EQU_LIST").toString());
             dto.setSupervisoryCode(obj.get("SUPERVISORY_CODE").toString());
@@ -655,6 +658,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 +764,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);
     }

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

@@ -179,8 +179,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);
-            //下一节点执行人机构
-            dto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(getNextUserOrgCode(operate, contract)));
+            //下一节点执行人单位（下节点接收机构code）
+            dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate, contract));
             ProcessTaskDTO complete = workflowService.complete(taskId, dto);
             // 更新下一步执行人、创建待办
             updateExecuteIds(instanceId, id, operate, complete);
@@ -383,8 +383,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     dto.setProcessDefinitionKey(WB_PROCESS_DEFINITION_KEY);
                     dto.setBusinessKey(contract.getApplyNo());
                     dto.setCompleteFirstTask(true);
-                    //下一节点执行人机构，维保单位
-                    dto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(contract.getMaintenanceUnitCode()));
+                    //下一节点执行人单位（下节点接收机构code）
+                    dto.setNextExecuteUserCompanyCode(contract.getMaintenanceUnitCode());
                     list.add(dto);
                     actWorkflowBatchDTO.setProcess(list);
                     List<ProcessTaskDTO> processTasks = workflowService.startBatch(actWorkflowBatchDTO);
@@ -440,8 +440,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         dto.setResultCode("approvalStatus");
         dto.setTaskId(contract.getNextTaskId());
         dto.setComment("提交流程");
-        //下一节点执行人机构，维保单位
-        dto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(contract.getMaintenanceUnitCode()));
+        //下一节点执行人单位（下节点接收机构code）
+        dto.setNextExecuteUserCompanyCode(contract.getMaintenanceUnitCode());
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         dto.setVariable(map);