优化：移装变更流程执行增加下一步节点接收机构编码参数

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

@@ -309,7 +309,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 oldTransfer.setCreateUserName(reginParams.getUserModel().getRealName());
                 oldTransfer.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
                 //启动流程
-                WorkflowResultDto workflowResult = this.startWorkFlork();
+                WorkflowResultDto workflowResult = this.startWorkFlork(oldTransfer.getReceiveOrgCode());
 
                 this.updateExecuteIds(instanceId, oldTransfer, "startWorkfow", workflowResult);
                 //生成代办
@@ -350,6 +350,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
             dto.setVariable(map);
+            //下一节点执行人单位（下节点接收机构code）
+            dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, transfer));
             if (!ObjectUtils.isEmpty(transfer) && (transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack()) || transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject()))) {
                 map.put("approvalStatus", "提交");
             }
@@ -394,7 +396,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         jgTransfer.setNextExecutorIds(role);
         this.update(jgTransfer, lambda);
         //待办 撤回
-//        JgChangeRegistrationTransfer data = this.baseMapper.selectOne(lambda);
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgTransfer));
         jsonObject.put("flowStatus", commonService.getDictionaryCodeByName(jgTransfer.getAuditStatus()));
         jsonObject.put("flowStatusLabel", jgTransfer.getAuditStatus());
@@ -1013,7 +1014,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     /**
      * 启动工作流
      */
-    private WorkflowResultDto startWorkFlork() {
+    private WorkflowResultDto startWorkFlork(String receiveOrgCreditCode) {
         try {
             ActWorkflowBatchDTO workflowBatchParams = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> workflowList = new ArrayList<>();
@@ -1021,6 +1022,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             workflow.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
             workflow.setBusinessKey("submit");
             workflow.setCompleteFirstTask(Boolean.TRUE);
+            //下一节点执行人单位（下节点接收机构code）
+            workflow.setNextExecuteUserCompanyCode(receiveOrgCreditCode);
             workflowList.add(workflow);
             workflowBatchParams.setProcess(workflowList);
             List<ProcessTaskDTO> processTasks = icmWorkflowService.startBatch(workflowBatchParams);
@@ -1083,4 +1086,19 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
         return String.format(result, transfer.getEquipListName(), transfer.getSupervisoryCode(), transfer.getApplyNo());
     }
+
+    public String getNextUserOrgCode(String operate, JgChangeRegistrationTransfer contract) {
+        String code = null;
+        if ("0".equals(operate)) {
+            code = contract.getReceiveOrgCode();
+        } else {
+            //驳回
+            if (WorkFlowStatusEnum.TRANSFER_RECEIVE.getName().equals(contract.getAuditStatus()) ||
+                    WorkFlowStatusEnum.TRANSFER_RECEIVE.getReject().equals(contract.getAuditStatus()) ||
+                    WorkFlowStatusEnum.TRANSFER_RECEIVE.getRollBack().equals(contract.getAuditStatus())) {
+                code = contract.getUseUnitCreditCode();
+            }
+        }
+        return code == null ? contract.getReceiveOrgCode() : code;
+    }
 }
\ No newline at end of file