From 957436c2b8d6bf0d3098e7e12484c807e80ac236 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 25 Dec 2023 15:31:26 +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=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectnotmet/service/ProcessProjectNotMetService.java | 7 +++++++
 1 file changed, 7 insertions(+)

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 26d8e758..dab7c6af 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
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.system.vo.SysDepartModel;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
@@ -89,6 +90,10 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         List<DictModel> assessResultsDictModels = sysBaseAPI.queryDictItemsByCode("assess_results");
         Map<String, String> assessResultsDictMap = CollStreamUtil.toMap(assessResultsDictModels, DictModel::getValue, DictModel::getText);
 
+        List<SysDepartModel> allSysDepart = sysBaseAPI.getAllSysDepart();
+        Map<String, String> departNameMap = CollStreamUtil.toMap(allSysDepart, SysDepartModel::getId, SysDepartModel::getDepartName);
+
+
         for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) {
                 String engineerId = processProjectNotMetLink.getEngineerId();
             processProjectNotMetLink.setEngineerId_dictText(userNameMap.get(engineerId));
@@ -96,6 +101,8 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
             processProjectNotMetLink.setState_dictText(stateDictMap.get(state));
             String assessResults = processProjectNotMetLink.getAssessResults();
             processProjectNotMetLink.setAssessResults_dictText(assessResultsDictMap.get(assessResults));
+            String departmentId = processProjectNotMetLink.getDepartmentId();
+            processProjectNotMetLink.setDepartmentId_dictText(departNameMap.get(departmentId));
         }
 
         ProcessProjectNotMet processProjectNotMet = this.getById(businessId);