维保备案列表合并接口修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml

@@ -119,7 +119,9 @@
         create_date,
         instance_id,
         promoter,
-        next_execute_ids
+        next_execute_ids,
+        create_user_id,
+        next_execute_user_ids
         FROM
         amos_tzs_biz.tzs_jg_maintenance_contract
         <where>

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,6 +179,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);
+            //下一节点执行人机构
+            dto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(getNextUserOrgCode(operate, contract)));
             ProcessTaskDTO complete = workflowService.complete(taskId, dto);
             // 更新下一步执行人、创建待办
             updateExecuteIds(instanceId, id, operate, complete);
@@ -187,6 +189,30 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         }
     }
 
+    public String getNextUserOrgCode(String operate, JgMaintenanceContract contract) {
+        String code = null;
+        if ("0".equals(operate)) {
+            //通过
+            if (WorkFlowStatusEnum.MAIN_SUBMIT.getName().equals(contract.getStatus()) ||
+                    WorkFlowStatusEnum.MAIN_SUBMIT.getReject().equals(contract.getStatus()) ||
+                    WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack().equals(contract.getStatus())) {
+                code = contract.getMaintenanceUnitCode();
+            } else if (WorkFlowStatusEnum.MAIN_RECEIVE.getName().equals(contract.getStatus()) ||
+                    WorkFlowStatusEnum.MAIN_RECEIVE.getReject().equals(contract.getStatus()) ||
+                    WorkFlowStatusEnum.MAIN_RECEIVE.getRollBack().equals(contract.getStatus())) {
+                code = contract.getReceiveOrgCode();
+            }
+        } else {
+            //驳回
+            if (WorkFlowStatusEnum.MAIN_RECEIVE.getName().equals(contract.getStatus()) ||
+                    WorkFlowStatusEnum.MAIN_RECEIVE.getReject().equals(contract.getStatus()) ||
+                    WorkFlowStatusEnum.MAIN_RECEIVE.getRollBack().equals(contract.getStatus())) {
+                code = contract.getMaintenanceUnitCode();
+            }
+        }
+        return code == null ? contract.getUseUnitCode() : code;
+    }
+
     /**
      * 批量删除
      */
@@ -357,6 +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()));
                     list.add(dto);
                     actWorkflowBatchDTO.setProcess(list);
                     List<ProcessTaskDTO> processTasks = workflowService.startBatch(actWorkflowBatchDTO);
@@ -412,6 +440,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         dto.setResultCode("approvalStatus");
         dto.setTaskId(contract.getNextTaskId());
         dto.setComment("提交流程");
+        //下一节点执行人机构，维保单位
+        dto.setNextExecuteUserOrgCode(commonMapper.getOrgCodeByCompanyCode(contract.getMaintenanceUnitCode()));
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         dto.setVariable(map);