From 619869dd1720b1f07517f661ddeb3eebb6d6807f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 12 Jan 2024 10:06:00 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsEvaluationNotMetController.java              | 2 +-
 .../modules/projectLibrary/entity/LawsEvaluationNotMet.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
index fd1fc569..fed3ed64 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
@@ -132,7 +132,7 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 	/**
     * 导出excel
     */
-    @RequestMapping(value = "/exportXls")
+    @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, LawsEvaluationNotMet lawsEvaluationNotMet) {
         return super.exportXls(request, lawsEvaluationNotMet, LawsEvaluationNotMet.class, "未符合项");
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java
index 90e35284..e1ab8503 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java
@@ -83,7 +83,7 @@ public class LawsEvaluationNotMet implements Serializable {
     private String departmentId;
 
 	/**设计工程师ID*/
-	@Excel(name = "设计工程师", width = 15, dictTable = "sys_user",dicText = "realname",dicCode = "id")
+	@Excel(name = "设计工程师", width = 15, dictTable = "sys_user",dicText = "CONCAT(realname, '(', username, ')')",dicCode = "id")
     @Dict(dictTable = "sys_user",dicText = "realname",dicCode = "id")
     @ApiModelProperty(value = "设计工程师ID")
     private String engineerId;