修改单位变更

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

@@ -228,6 +228,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 dto.setCompleteFirstTask(true);
                 list.add(dto);
                 actWorkflowBatchDTO.setProcess(list);
+                dto.setNextExecuteUserCompanyCode(noticeDto.getReceiveOrgCode());
                 processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
                 String instanceId = processTasks.get(0).getProcessInstance().getId();
                 String nextTaskId = processTasks.get(0).getNextTask().get(0).getId();
@@ -275,6 +276,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 }
                 task.setVariable(map);
                 //执行流程
+                task.setNextExecuteUserCompanyCode(noticeDto.getReceiveOrgCode());
                 ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, task);
                 JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
                 BeanUtils.copyProperties(noticeDto, bean);
@@ -409,6 +411,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(String.valueOf(i));
+                dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
                  dto.setCompleteFirstTask(true);
                 list.add(dto);
             }
@@ -759,6 +762,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         task.setResultCode("approvalStatus");
         task.setTaskId(taskId);
         task.setComment("");
+        task.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(op,dto));
+
+        task.setNextExecuteUserCompanyCode(dto.getReceiveOrgCode());
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         if (!ObjectUtils.isEmpty(jgChangeRegistrationUnit.getInstanceStatus()) &&
@@ -1111,7 +1117,20 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     }
 
 
-
+    private String getNextUserOrgCode(String operate, JgChangeRegistrationUnitDto jgChangeRegistrationName) {
+        if("0".equals(operate)){
+            // 执行通过节点，单位code为接收机构单位信息
+            return jgChangeRegistrationName.getReceiveOrgCode();
+        }
+        if(jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass())
+                || jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getReject())
+                || jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getRollBack())){
+            // 驳回且当前节点为一键节点时，单位code为发起人单位信息
+            return jgChangeRegistrationName.getUseUnitCreditCode();
+        }
+        // 2、3级驳回时，单位code为接收单位code
+        return  jgChangeRegistrationName.getReceiveOrgCode();
+    }
     private Integer getTaskStatusByName(String auditStatus) {
         return commonServiceImpl.getDictionaryCodeByName(auditStatus);
     }