From a869cf08cd98a70d5b9f5e1aed028d5d12993c8a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 25 Dec 2023 15:22:19 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=B5=81=E7=A8=8B=20=E8=BD=AC=E5=8A=9E?=
 =?UTF-8?q?=E5=90=8E=E9=A9=B3=E5=9B=9E=E7=BB=99=E8=BD=AC=E5=8A=9E=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/ProcessProjectNotMetCommon.java    |  1 +
 .../service/ProcessProjectNotMetService.java  | 34 +++++++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java
index 5609837b..b2e19eb2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java
@@ -8,6 +8,7 @@ public class ProcessProjectNotMetCommon {
     public static final String STANDARDS_ENGINEER = "standardsEngineer";
     public static final String MANAGER_LEADER = "managerLeader";
     public static final String DESIGN_ENGINEER = "designEngineer";
+    public static final String PASS = "pass";
     /**
      *法规工程师发起整改
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
index 3c07c915..26d8e758 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
@@ -164,19 +164,40 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
                 break;
             default:
         }
-        // 完成任务
-        Map<String, Object> variables = new HashMap<>();
-        variables.put(ProcessProjectAssessCommon.PASS, pass);
-        taskService.complete(taskId, variables);
+
 
     }
 
     private void zgjldspApprove(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
-
+        // 完成任务
+        Map<String, Object> variables = new HashMap<>();
+        if (!pass){
+            String businessId = processInfoVO.getBusinessId();
+            LambdaQueryWrapper<ProcessProjectNotMetLink> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(ProcessProjectNotMetLink::getProcessId,businessId);
+            wrapper.last("limit 1");
+            ProcessProjectNotMetLink projectNotMetLink = processProjectNotMetLinkService.getOne(wrapper);
+            String engineerId = projectNotMetLink.getEngineerId();
+            variables.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, engineerId);
+        }
+        variables.put(ProcessProjectNotMetCommon.PASS, pass);
+        taskService.complete(processDTO.getTaskId(), variables);
     }
 
     private void fggcsspApprove(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
-
+        // 完成任务
+        Map<String, Object> variables = new HashMap<>();
+        if (!pass){
+            String businessId = processInfoVO.getBusinessId();
+            LambdaQueryWrapper<ProcessProjectNotMetLink> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(ProcessProjectNotMetLink::getProcessId,businessId);
+            wrapper.last("limit 1");
+            ProcessProjectNotMetLink projectNotMetLink = processProjectNotMetLinkService.getOne(wrapper);
+            String engineerId = projectNotMetLink.getEngineerId();
+            variables.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, engineerId);
+        }
+        variables.put(ProcessProjectNotMetCommon.PASS, pass);
+        taskService.complete(processDTO.getTaskId(), variables);
     }
 
     public void submit(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO) {
@@ -199,6 +220,7 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) {
             processProjectNotMetLink.setFileId(processProjectNotMetLink.getFileId());
             processProjectNotMetLink.setDescription(processProjectNotMetLink.getDescription());
+            processProjectNotMetLink.setEngineerId(CurrentUserUtil.getId());
             processProjectNotMetLink.setRealityTime(now);
         }
         processProjectNotMetLinkService.updateBatchById(processProjectNotMetLinks);