From c7e046a447516c92f5a0d06541271c9b3de27bc4 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sun, 4 Feb 2024 14:56:14 +0800
Subject: [PATCH] fix: 81668

---
 .../enterprise/entity/dto/ESQueryCommonDTO.java  | 16 ++++++++++++++++
 .../xml/EnterpriseStandardRecheckPlanMapper.xml  |  8 ++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

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 68b67dbc..66cfeacb 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
@@ -133,6 +133,10 @@ public class ESQueryCommonDTO {
     @ApiModelProperty(value = "复审计划-复审结果")
     private String recheckResult;
 
+    @ApiModelProperty(value = "复审计划-复审结果")
+    @JSONField(serialize = false)
+    private List<String> recheckResultList;
+
     public void transIdsToList() {
         if (StrUtil.isBlank(this.selections)) {
             return;
@@ -144,4 +148,16 @@ public class ESQueryCommonDTO {
         this.selections = selections;
         this.transIdsToList();
     }
+
+    public void setRecheckResult(String recheckResult) {
+        this.recheckResult = recheckResult;
+        this.transIdsToList();
+    }
+
+    public void transResultsToList() {
+        if (StrUtil.isBlank(this.recheckResult)) {
+            return;
+        }
+        this.recheckResultList = StrUtil.split(this.recheckResult, StrUtil.COMMA);
+    }
 }
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 4ee5321a..72793274 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
@@ -26,6 +26,7 @@
     <select id="page" resultType="com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo">
         SELECT
             p.id,
+            p.create_time,
             s.id AS standardId,
             s.standard_number AS standardNo,
             s.standard_name AS standardName,
@@ -72,8 +73,11 @@
                 AND s.main_drafting_unit = #{param.mainDraftingUnit}
             </if>
             <!--复审结果-->
-            <if test="param.recheckResult != null and param.recheckResult != ''">
-                AND p.recheck_result IN #{param.recheckResult}
+            <if test="param.recheckResultList != null and param.recheckResultList.size() > 0">
+                AND p.recheck_result IN
+                <foreach item="item" index="index" collection="param.recheckResultList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
         GROUP BY
             s.standard_number, p.create_time