From 0f760583af879207e95b610e1828fb529f5b308f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 26 Sep 2024 16:16:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20=E6=9D=A1?=
 =?UTF-8?q?=E6=AC=BE=E5=88=97=E8=A1=A8=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessAnnualInitLink.java          | 17 +++++++++++------
 .../service/ProcessAnnualInitLinkService.java  | 18 +++++++++++++++++-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java
index 2a890715..a037bd18 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java
@@ -2,10 +2,7 @@ package com.jero.modules.activiti.process.annualinit.entity;
 
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -67,13 +64,21 @@ public class ProcessAnnualInitLink implements Serializable {
      * 起草人
      */
     @ApiModelProperty(value = "起草人")
-    @Excel(name = "起草人", width = 15)
+    @Excel(name = "起草人", width = 15, dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')", dicCode = "id")
+    @Dict(dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')", dicCode = "id")
     private String mainDraftingUser;
+    /**
+     * 邮箱
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "邮箱")
+    private String email;
     /**
      * 所在部门id
      */
     @ApiModelProperty(value = "所在部门id")
-    @Excel(name = "所在部门", width = 15)
+    @Excel(name = "所在部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
     private String departId;
     /**
      * 专业模块
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
index fcb5ccc6..82406210 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
@@ -1,7 +1,11 @@
 package com.jero.modules.activiti.process.annualinit.service;
 
+import cn.hutool.core.collection.CollStreamUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.DictModel;
+import com.jero.common.util.PasswordUtil;
 import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInitLink;
 import com.jero.modules.activiti.process.annualinit.mapper.ProcessAnnualInitLinkMapper;
 import org.springframework.stereotype.Service;
@@ -15,6 +19,7 @@ import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 年度制修订计划流程关联标准(ProcessAnnualInitLink)表服务实现类
@@ -27,10 +32,21 @@ import java.util.List;
 public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitLinkMapper, ProcessAnnualInitLink> {
     @Resource
     private ProcessAnnualInitLinkMapper processAnnualInitLinkMapper;
+    @Resource
+    private ISysBaseAPI sysBaseAPI;
 
     public IPage<ProcessAnnualInitLink> pageList(Page<ProcessAnnualInitLink> page, ProcessAnnualInitLink processAnnualInitLink, HttpServletRequest req) {
         QueryWrapper<ProcessAnnualInitLink> queryWrapper = QueryGenerator.initQueryWrapper(processAnnualInitLink, req.getParameterMap());
-        return this.page(page, queryWrapper);
+        Page<ProcessAnnualInitLink> pageList = this.page(page, queryWrapper);
+        List<DictModel> dictModels = sysBaseAPI.queryFilterTableDictInfo("sys_user", "email", "id", "");
+        Map<String, String> userMap = CollStreamUtil.toMap(dictModels, DictModel::getText, DictModel::getValue);
+        for (ProcessAnnualInitLink record : pageList.getRecords()) {
+            String mainDraftingUser = record.getMainDraftingUser();
+            String email = userMap.get(mainDraftingUser);
+            record.setEmail(PasswordUtil.decrypt(email));
+        }
+
+        return pageList;
     }
 
     public void add(ProcessAnnualInitLink processAnnualInitLink) {