From 5ae2e793db01e1addcef57153fd304546085bf51 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 9 Jul 2024 14:47:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B-=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=8B=86=E8=A7=A3=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...essStandardComplianceCheckServiceImpl.java | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index a9d3440a..b3bd92c7 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -180,13 +180,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(processTask, taskId);
         String curUserId = UserUtils.getUserId();
+        Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
         switch (xmlNodeId) {
-            case DEPT_USER_DISTRIBUTE:
-                break;
-            case MAIN_CHECK_USER_DISTRIBUTE:
-//                this.mainCheckUserDistribute()
-                runtimeService.setVariable(processInstanceId, DISTRIBUTE, true);
-                break;
             case MAIN_CHECK_USER_REDISTRIBUTE:
                 runtimeService.setVariable(processInstanceId, DISTRIBUTE, true);
                 break;
@@ -215,7 +210,36 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
 
     @Override
     public void submit(ProcessInfoVO<ProcessSccVO> processInfoVO) {
-
+        BasicTaskInfoDTO processTask = processInfoVO.getBasicTaskInfoDTO();
+        String taskId = processTask.getTaskId();
+        // 获取task
+        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
+            throw new JeroBootException("taskId为空或任务不存在");
+        }
+        String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        // 获取执行id
+        String executionId = task.getExecutionId();
+        // 获取当前节点的id
+        ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
+        String xmlNodeId = record.getNodeId();
+        String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(processTask, taskId);
+        String curUserId = UserUtils.getUserId();
+        Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
+        switch (xmlNodeId) {
+            case DEPT_USER_DISTRIBUTE:
+                // 设置主排查人
+                String mainCheckUser = userInfoMap.get(MAIN_CHECK_USER).toString();
+                runtimeService.setVariable(processInstanceId, MAIN_CHECK_USER, mainCheckUser);
+                break;
+            case MAIN_CHECK_USER_DISTRIBUTE:
+                // 驳回
+                break;
+        }
+        // 审批节点
+        actFlowCommonService.completeTask(taskId, curUserId);
     }
 
     @Override
@@ -339,8 +363,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             log.error(e.getMessage(), e);
             throw new JeroBootException("上传模板错误，请检查后重试。");
         }
-        // 使用Grade的静态方法验证header
-        boolean isMatched = ModelExcelVO.validateExcelHeaders(headers);
+        boolean isMatched = SplitExcelVO.validateExcelHeaders(headers);
         if (!isMatched) {
             throw new JeroBootException("上传模板错误，请检查后重试。");
         }
@@ -371,7 +394,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             log.error(e.getMessage(), e);
             throw new JeroBootException("上传模板错误，请检查后重试。");
         }
-        // 使用Grade的静态方法验证header
         boolean isMatched = ModelExcelVO.validateExcelHeaders(headers);
         if (!isMatched) {
             throw new JeroBootException("上传模板错误，请检查后重试。");