From 87876ecd1d65b07b6e54443f11dd5d24dbd0b2cd Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sun, 4 Feb 2024 14:23:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=8D=E5=AE=A1=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=8D=E5=AE=A1=E7=BB=93=E6=9E=9C=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/enterprise/entity/dto/ESQueryCommonDTO.java        | 3 +++
 .../mapper/xml/EnterpriseStandardRecheckPlanMapper.xml      | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 c4a9dc8d..68b67dbc 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
@@ -130,6 +130,9 @@ public class ESQueryCommonDTO {
     @ApiModelProperty(value = "复审计划-主起草单位")
     private String mainDraftingUnit;
 
+    @ApiModelProperty(value = "复审计划-复审结果")
+    private String recheckResult;
+
     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 ba24098b..4ee5321a 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
@@ -71,9 +71,13 @@
             <if test="param.mainDraftingUnit != null and param.mainDraftingUnit != ''">
                 AND s.main_drafting_unit = #{param.mainDraftingUnit}
             </if>
+            <!--复审结果-->
+            <if test="param.recheckResult != null and param.recheckResult != ''">
+                AND p.recheck_result IN #{param.recheckResult}
+            </if>
         GROUP BY
             s.standard_number, p.create_time
         ORDER BY
             p.create_time DESC
-    </select>
+</select>
 </mapper>