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

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