From da70a100fa74eb28d16a9cd9191432c740cc34bd Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 18 Jan 2024 17:49:30 +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

---
 .../service/ProcessProjectStandardService.java           | 9 ++++++++-
 .../projectstandard/vo/ProcessProjectStandardVO.java     | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

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 3fcaf700..441510df 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
@@ -235,10 +235,17 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 term.setAssessResults_dictText(assessResultsMap.get(assessResults));
             }
         }
+        String moduleOwner1 = null;
+        if (processProjectStandardTermList.size()>0){
+            ProcessProjectStandardTerm term = processProjectStandardTermList.get(0);
+            String moduleOwner = term.getModuleOwner();
+            moduleOwner1 = userNameMap.get(moduleOwner);
+        }
         ProcessProjectStandard processProjectStandard = this.getById(processId);
 
 
         ProcessProjectStandardVO processProjectStandardVO = new ProcessProjectStandardVO();
+        processProjectStandardVO.setModuleOwner(moduleOwner1);
         processProjectStandardVO.setProcessProjectStandard(processProjectStandard);
         processProjectStandardVO.setProcessProjectStandardTermList(processProjectStandardTermList);
         //processProjectStandardVO.setProcessProjectStandardTermUserList();
@@ -615,7 +622,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 }
                 List<String> designEngineerList = Arrays.asList(designEngineers.split(","));
                 designEngineerIds.addAll(designEngineerList);
-                updateWrapper.set(ProcessProjectStandardTermUser::getModuleOwner, designEngineerList.get(0));
+                updateWrapper.set(ProcessProjectStandardTermUser::getDesignEngineer, designEngineerList.get(0));
                 termUserService.update(updateWrapper);
 
                 if (designEngineerList.size() >= 2){
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java
index 4a543d77..4ce090bf 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java
@@ -18,6 +18,9 @@ public class ProcessProjectStandardVO {
     /**业务基本信息*/
     @ApiModelProperty(value = "业务基本信息")
     private ProcessProjectStandard processProjectStandard;
+    /**上一节点处理人*/
+    @ApiModelProperty(value = "上一节点处理人")
+    private String moduleOwner;
     /**关联条款列表*/
     @ApiModelProperty(value = "关联条款列表")
     private List<ProcessProjectStandardTerm> processProjectStandardTermList;