Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -115,5 +115,8 @@ public class EsRevisePlan extends BasePage {
     @TableField("buss_sort")
     private String bussSort;
 
+    @TableField(exist = false)
+    private List<String> planStatusList;
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java

@@ -10,10 +10,14 @@ import com.adc.da.slrs.esStandRelation.service.IEsStandRelationService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -47,6 +51,10 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     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);
+        }
         List<EsRevisePlan> esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan);
         return esRevisePlans;
     }

adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml

@@ -226,8 +226,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}