From 88e887eb16a959b79b837cda2f06aba8c4998617 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 18 Jan 2024 16:47:43 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessProjectStandardService.java        | 85 ++++++++++---------
 1 file changed, 46 insertions(+), 39 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index 7b9e2500..c7fe0336 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -329,6 +329,45 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         processHandleService.startProcess(processInfoVO);
     }
 
+    public void submit(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO) {
+        BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
+        String taskId = basicTaskInfoDTO.getTaskId();
+        ProcessDTO processDTO = processHandleService.getProcessDTO(taskId);
+        String processInstanceId = processDTO.getProcessInstanceId();
+        ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
+        processInfoVO.setBusinessId(processAll.getProjectId());
+        Task task = processDTO.getTask();
+        String taskDefinitionKey = task.getTaskDefinitionKey();
+        if (taskDefinitionKey.contains("_") && !taskDefinitionKey.contains(ProcessProjectStandardCommon.MKZRRFF_)){
+            taskDefinitionKey = taskDefinitionKey.substring(0,taskDefinitionKey.length()-1);
+        }
+        processHandleService.updateApprovalRecord(processInfoVO);
+        switch (taskDefinitionKey){
+            //部所主管级领导下发
+            case ProcessProjectStandardCommon.BSZGJLDXF:
+                bszgjldxfSubmit(processInfoVO, processDTO);
+                break;
+            //模块责任人分发
+            //驳回后模块责任人分发
+            case ProcessProjectStandardCommon.MKZRRFF_1:
+                mkzrrffSubmit(processInfoVO, processDTO, false);
+                break;
+            case ProcessProjectStandardCommon.MKZRRFF_4:
+            case ProcessProjectStandardCommon.MKZRRFF_5:
+                mkzrrffSubmit(processInfoVO, processDTO, true);
+                break;
+            //设计工程师评估
+            case ProcessProjectStandardCommon.SJGCSPG_:
+                sjgcspgSubmit(processInfoVO, processDTO);
+                break;
+            //设计工程师补充工作令编号
+            case ProcessProjectStandardCommon.SJGCSBCGZLBH:
+                sjgcsbcgzlbhSubmit(processInfoVO, processDTO);
+                break;
+            default:
+        }
+    }
+
     public void approveTask(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, boolean pass) {
         BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
         String taskId = basicTaskInfoDTO.getTaskId();
@@ -474,44 +513,6 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         sendMessageAPI.sendMessage(sendMessageDTO);
     }
 
-    public void submit(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO) {
-        BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
-        String taskId = basicTaskInfoDTO.getTaskId();
-        ProcessDTO processDTO = processHandleService.getProcessDTO(taskId);
-        String processInstanceId = processDTO.getProcessInstanceId();
-        ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
-        processInfoVO.setBusinessId(processAll.getProjectId());
-        Task task = processDTO.getTask();
-        String taskDefinitionKey = task.getTaskDefinitionKey();
-        if (taskDefinitionKey.contains("_") && !taskDefinitionKey.contains(ProcessProjectStandardCommon.MKZRRFF_)){
-            taskDefinitionKey = taskDefinitionKey.substring(0,taskDefinitionKey.length()-1);
-        }
-        processHandleService.updateApprovalRecord(processInfoVO);
-        switch (taskDefinitionKey){
-            //部所主管级领导下发
-            case ProcessProjectStandardCommon.BSZGJLDXF:
-                bszgjldxfSubmit(processInfoVO, processDTO);
-                break;
-            //模块责任人分发
-            //驳回后模块责任人分发
-            case ProcessProjectStandardCommon.MKZRRFF_1:
-                mkzrrffSubmit(processInfoVO, processDTO, false);
-                break;
-            case ProcessProjectStandardCommon.MKZRRFF_4:
-            case ProcessProjectStandardCommon.MKZRRFF_5:
-                mkzrrffSubmit(processInfoVO, processDTO, true);
-                break;
-            //设计工程师评估
-            case ProcessProjectStandardCommon.SJGCSPG_:
-                sjgcspgSubmit(processInfoVO, processDTO);
-                break;
-            //设计工程师补充工作令编号
-            case ProcessProjectStandardCommon.SJGCSBCGZLBH:
-                sjgcsbcgzlbhSubmit(processInfoVO, processDTO);
-                break;
-            default:
-        }
-    }
     //部所主管级领导下发
     private void bszgjldxfSubmit(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO) {
         String businessId = processInfoVO.getBusinessId();
@@ -605,7 +606,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 termUserService.update(updateWrapper);
             }else {
                 //如果设计工程师有一个就更新，有多个就新增剩下的
-                String designEngineers = termUser.getDesignEngineer();
+                String designEngineers = term.getDesignEngineer();
                 if (StringUtils.isBlank(designEngineers)){
                     throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED);
                 }
@@ -714,6 +715,12 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
     }
 
     public void autoComplete(DelegateTask delegateTask) {
+        String assignee = delegateTask.getAssignee();
+        String executionParentId = delegateTask.getFormKey();
+        String processInstanceId = delegateTask.getProcessInstanceId();
+        ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
+        String projectId = processAll.getProjectId();
+        List<ProcessProjectStandardTerm> termList = termMapper.getByModuleOwner(projectId, assignee, executionParentId, false);
 
     }