From 407b3468602ab1aa3b2c6e360b7757a99290cf8c Mon Sep 17 00:00:00 2001
From: caozhen <18736171426@139.com>
Date: Mon, 11 Sep 2023 17:42:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D=E5=B7=A5=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsProjectLibraryController.java         |  2 +-
 .../entity/LawsProjectLibrary.java            |  5 ++++
 .../impl/LawsProjectLibraryServiceImpl.java   | 23 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java
index 1c386bfe..e667c04e 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java
@@ -136,7 +136,7 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
     */
 	@AutoLog(value = "项目库-导出excel")
 	@ApiOperation(value="项目库-导出excel", notes="项目库-导出excel")
-    @PostMapping(value = "/exportXls")
+    @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, LawsProjectLibrary lawsProjectLibrary, HttpServletResponse response) {
 		String outFileName = MessageUtils.getLanguage().equals("EN") ? "Internal Work Group Personnel Table" + System.currentTimeMillis() + ".xlsx" :  "内部工作组人员表" + System.currentTimeMillis() + ".xlsx";
 		String ENCODING = "UTF-8";
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java
index c00c4486..1d473abb 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsProjectLibrary.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.aspect.annotation.Dict;
@@ -88,4 +89,8 @@ public class LawsProjectLibrary implements Serializable {
 	/**删除状态(0-正常,1-删除)*/
     @ApiModelProperty(value = "删除状态(0-正常,1-删除)")
     private String delFlag;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "姓名+工号")
+    private String nameWorkNo;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java
index b23b21cc..99f53c03 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsProjectLibraryServiceImpl.java
@@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.modules.projectLibrary.entity.LawsProjectLibrary;
 import com.jero.modules.projectLibrary.mapper.LawsProjectLibraryMapper;
 import com.jero.modules.projectLibrary.service.ILawsProjectLibraryService;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.jero.common.exception.JeroBootException;
@@ -28,6 +32,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 @Transactional(rollbackFor = JeroBootException.class)
 public class LawsProjectLibraryServiceImpl extends ServiceImpl<LawsProjectLibraryMapper, LawsProjectLibrary> implements ILawsProjectLibraryService {
 
+	@Autowired
+	private ISysUserService sysUserService;
 
     /**
      * 分页查询
@@ -37,9 +43,24 @@ public class LawsProjectLibraryServiceImpl extends ServiceImpl<LawsProjectLibrar
                         HttpServletRequest req) {
         QueryWrapper<LawsProjectLibrary> queryWrapper = QueryGenerator.initQueryWrapper(lawsProjectLibrary, req.getParameterMap());
         Page<LawsProjectLibrary> page = new Page<>(pageNo, pageSize);
-        return page(page, queryWrapper);
+		Page<LawsProjectLibrary> libraryPage = page(page, queryWrapper);
+		this.voluation(libraryPage.getRecords());
+		return libraryPage;
     }
 
+	/**
+	 * 赋值姓名+工号
+	 */
+	private void voluation(List<LawsProjectLibrary> pageRecords){
+		for (LawsProjectLibrary pageRecord : pageRecords) {
+			String projectLeader = pageRecord.getProjectLeader();
+			if (StringUtils.isNotBlank(projectLeader)){
+				SysUser user = sysUserService.getById(projectLeader);
+				pageRecord.setNameWorkNo(user.getNameWorkNo());
+			}
+		}
+	}
+
 	/**
 	 * 保存
 	 */