From bdb18046c989d66765d4d12991a37340faae4ab1 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 25 Dec 2023 15:14:12 +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=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessProjectNotMetLink.java      | 19 +++++++++++++++++++
 .../service/ProcessProjectNotMetService.java  | 16 ++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java
index c97012ae..b6321c07 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java
@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -101,6 +103,12 @@ public class ProcessProjectNotMetLink {
     @ApiModelProperty(value = "条款名称")
     private String termName;
 
+    /**责任部门ID*/
+    @Excel(name = "责任部门ID", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @ApiModelProperty(value = "责任部门ID")
+    private String departmentId;
+
     /**
      * 设计工程师ID
      */
@@ -152,6 +160,12 @@ public class ProcessProjectNotMetLink {
     @ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)")
     private String state;
 
+
+    /**评估结果(1-符合、2-不符合、3-待验证、4-不涉及)*/
+    @Dict(dicCode = "assess_results")
+    @ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-待验证、4-不涉及)")
+    private String assessResults;
+
     /**
      * 创建人ID
      */
@@ -198,5 +212,10 @@ public class ProcessProjectNotMetLink {
     @ApiModelProperty(value = "删除标识")
     private Boolean delFlag;
 
+    private String departmentId_dictText;
+    private String engineerId_dictText;
+    private String state_dictText;
+    private String assessResults_dictText;
+
 
 }
\ No newline at end of file
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 a3797262..3c07c915 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
@@ -1,8 +1,10 @@
 package com.jero.modules.activiti.process.projectnotmet.service;
 
+import cn.hutool.core.collection.CollStreamUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
@@ -81,6 +83,20 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         for (LoginUser loginUser : userList) {
             userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo());
         }
+        List<DictModel> stateDictModels = sysBaseAPI.queryDictItemsByCode("state");
+        Map<String, String> stateDictMap = CollStreamUtil.toMap(stateDictModels, DictModel::getValue, DictModel::getText);
+
+        List<DictModel> assessResultsDictModels = sysBaseAPI.queryDictItemsByCode("assess_results");
+        Map<String, String> assessResultsDictMap = CollStreamUtil.toMap(assessResultsDictModels, DictModel::getValue, DictModel::getText);
+
+        for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) {
+                String engineerId = processProjectNotMetLink.getEngineerId();
+            processProjectNotMetLink.setEngineerId_dictText(userNameMap.get(engineerId));
+            String state = processProjectNotMetLink.getState();
+            processProjectNotMetLink.setState_dictText(stateDictMap.get(state));
+            String assessResults = processProjectNotMetLink.getAssessResults();
+            processProjectNotMetLink.setAssessResults_dictText(assessResultsDictMap.get(assessResults));
+        }
 
         ProcessProjectNotMet processProjectNotMet = this.getById(businessId);
         ProcessProjectNotMetVO processProjectNotMetVO = new ProcessProjectNotMetVO();