From 0013c74dbca2d9c1aba796aea87a4d856bcd4781 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 9 Jan 2024 17:35:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080419=20=E4=BC=81=E6=A0=87=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=A1=E6=B5=81=E7=A8=8B--=E9=80=89=E6=8B=A9=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87--=E6=9F=A5=E8=AF=A2=E6=9C=AA=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/enterprise/entity/dto/ESQueryCommonDTO.java   |  6 ++++++
 .../mapper/xml/EnterpriseStandardRecheckPlanMapper.xml | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java
index 51deb54d..5d582121 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java
@@ -114,6 +114,12 @@ public class ESQueryCommonDTO {
     @ApiModelProperty(value = "复审计划-复审结束日期")
     private Date recheckEndDate;
 
+    @ApiModelProperty(value = "复审计划-主起草人")
+    private String mainDraftingUser;
+
+    @ApiModelProperty(value = "复审计划-主起草单位")
+    private String mainDraftingUnit;
+
     public void transIdsToList() {
         if (StrUtil.isBlank(this.selections)) {
             return;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml
index adf61b8b..4560cda7 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml
@@ -38,6 +38,8 @@
         FROM
             laws_enterprise_standard_recheck_plan AS p
                 LEFT JOIN laws_enterprise_standard AS s ON s.id = p.standard_id
+                LEFT JOIN sys_user AS u ON u.id = s.main_drafting_user
+                LEFT JOIN sys_depart AS d ON d.id = s.main_drafting_unit
         WHERE 1 = 1
             <!--企标编号判断-->
             <if test="param.standardNo != null and param.standardNo != ''">
@@ -61,6 +63,14 @@
                     #{item}
                 </foreach>
             </if>
+            <!--主起草人-->
+            <if test="param.mainDraftingUser != null and param.mainDraftingUser != ''">
+                AND CONCAT(u.realname, '(', u.username, ')') LIKE CONCAT('%',#{param.mainDraftingUser},'%')
+            </if>
+            <!--主起草单位-->
+            <if test="param.mainDraftingUnit != null and param.mainDraftingUnit != ''">
+                AND s.main_drafting_unit = #{param.mainDraftingUnit}
+            </if>
         ORDER BY
             p.create_time DESC
     </select>