From 51a49d194bae5d600076572206c66b67f08cf881 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 27 Mar 2022 17:29:38 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../esRevisePlan/service/impl/EsRevisePlanServiceImpl.java | 4 ++--
 .../mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml     | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
index 20c70db4..1b6e05c4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
@@ -49,12 +49,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
 
     @Override
     public List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan) {
-        Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
-        esRevisePlan.getPager().setRowCount(count);
         if(StringUtils.isNotBlank(esRevisePlan.getPlanStatus())){
             List<String> list= Arrays.stream(esRevisePlan.getPlanStatus().split(",")).map(String::trim).collect(Collectors.toList());
             esRevisePlan.setPlanStatusList(list);
         }
+        Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
+        esRevisePlan.getPager().setRowCount(count);
         List<EsRevisePlan> esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan);
         return esRevisePlans;
     }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
index fea29b3a..019d4437 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
@@ -86,8 +86,11 @@
             <if test="area != null and area != ''">
                 and area = #{area}
             </if>
-            <if test="planStatus != null and planStatus != ''">
-                and plan_status = #{planStatus}
+            <if test="planStatusList != null">
+                and plan_status in
+                <foreach collection="planStatusList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="reviseStatus != null and reviseStatus != ''">
                 and revise_status = #{reviseStatus}