fit:1、案件核查、信访投诉、公安部&国家信访 涉企涉冻多选筛选

src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java

@@ -28,7 +28,7 @@ public class DataCaseVerifQueryParam extends BasePage {
 
     private String checkStatus; // 是否属实
 
-    private String involvedIssue;
+    private List<String> involvedIssue;
 
 
     // 问题发现时间

src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java

@@ -39,6 +39,6 @@ public class DataPetitionComplaintQueryParam extends BasePage {
     // 初重信访
     private String initialPetition;
 
-    private String involvedIssue;
+    private List<String> involvedIssue;
 
 }

src/main/java/com/biutag/supervision/pojo/param/DataThreadQueryParam.java

@@ -22,7 +22,7 @@ public class DataThreadQueryParam extends BasePage {
     //初重访
     private String initialPetition;
     //涉企涉冻
-    private String involvedIssue;
+    private List<String> involvedIssue;
     //具体内容
     private String thingDesc;
     //是否分发

src/main/java/com/biutag/supervision/service/DataCaseVerifService.java

@@ -1,5 +1,6 @@
 package com.biutag.supervision.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -41,7 +42,7 @@ public class DataCaseVerifService extends ServiceImpl<DataCaseVerifMapper, DataC
         queryWrapper.like(StrUtil.isNotBlank(queryParam.getOriginId()), DataCaseVerif::getOriginId, queryParam.getOriginId())
                 .like(StrUtil.isNotBlank(queryParam.getThingDesc()), DataCaseVerif::getThingDesc, queryParam.getThingDesc())
                 .eq(StrUtil.isNotBlank(queryParam.getCheckStatus()), DataCaseVerif::getIsReal, queryParam.getCheckStatus())
-                .eq(StrUtil.isNotBlank(queryParam.getInvolvedIssue()),DataCaseVerif::getInvolvedIssue,queryParam.getInvolvedIssue())
+                .in(CollectionUtil.isNotEmpty(queryParam.getInvolvedIssue()),DataCaseVerif::getInvolvedIssue,queryParam.getInvolvedIssue())
                 .eq(StrUtil.isNotBlank(queryParam.getDistributionState()), DataCaseVerif::getDistributionState, queryParam.getDistributionState())
                 .orderByDesc(DataCaseVerif::getCreateTime);
         if( !queryParam.getDiscoveryTime().isEmpty()){

src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java

@@ -1,6 +1,7 @@
 package com.biutag.supervision.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -57,7 +58,7 @@ public class DataPetitionComplaintService extends ServiceImpl<DataPetitionCompla
                 .like(StrUtil.isNotBlank(queryParam.getThingDesc()), "pc.thing_desc", queryParam.getThingDesc())
                 .eq(StrUtil.isNotBlank(queryParam.getDistributionState()), "pc.distribution_state", queryParam.getDistributionState())
                 .eq(StrUtil.isNotBlank(queryParam.getInitialPetition()), "pc.initial_petition", queryParam.getInitialPetition())
-                .eq(StrUtil.isNotBlank(queryParam.getInvolvedIssue()),"pc.involved_issue",queryParam.getInvolvedIssue())
+                .in(CollectionUtil.isNotEmpty(queryParam.getInvolvedIssue()),"pc.involved_issue",queryParam.getInvolvedIssue())
                 .orderByDesc("pc.discovery_time");
         if (queryParam.getDiscoveryTime().size() == 2) {
             queryWrapper.between("pc.discovery_time", queryParam.getDiscoveryTime().get(0), queryParam.getDiscoveryTime().get(1));

src/main/java/com/biutag/supervision/service/DataThreadService.java

@@ -85,10 +85,14 @@ public class DataThreadService {
                            break;
                    }
                }
+               if(CollectionUtil.isEmpty(queryParam.getInvolvedIssue())){
+                   return Result.success(new Page<>());
+               }
                return Result.success(dataMailboxService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), wrapper));
            }
            else{
                LambdaQueryWrapper<DataCaseVerif> wrapper = new LambdaQueryWrapper<DataCaseVerif>()
+                       .in(CollectionUtil.isNotEmpty(queryParam.getInvolvedIssue()),DataCaseVerif::getInvolvedIssue,queryParam.getInvolvedIssue())
                        .like(StrUtil.isNotBlank(queryParam.getOriginId()), DataCaseVerif::getOriginId, queryParam.getOriginId())
                        .like(StrUtil.isNotBlank(queryParam.getThingDesc()), DataCaseVerif::getThingDesc, queryParam.getThingDesc());
                if (queryParam.getDiscoveryTime().size() == 2) {

src/main/resources/mapper/DataThreadMapper.xml

@@ -34,8 +34,11 @@
                    <if test = "query.originId != null and query.originId != '' ">
                        and origin_id like concat('%',#{query.originId,jdbcType=VARCHAR},'%')
                    </if>
-                    <if test="query.involvedIssue != null and query.involvedIssue != ''">
-                        and involved_issue = #{query.involvedIssue}
+                    <if test="query.involvedIssue != null and query.involvedIssue != '' and query.involvedIssue.size() > 0">
+                        and involved_issue in
+                        <foreach collection="query.involvedIssue" item="data" open="(" close=")" separator=",">
+                            #{data}
+                        </foreach>
                     </if>
                     <if test="query.thingDesc != null and query.thingDesc != ''">
                         and thing_desc like concat('%',#{query.thingDesc,jdbcType=VARCHAR},'%')
@@ -92,8 +95,11 @@
             <if test = "query.originId != null and query.originId != '' ">
                 and origin_id like concat('%',#{query.originId,jdbcType=VARCHAR},'%')
             </if>
-            <if test="query.involvedIssue != null and query.involvedIssue != ''">
-                and involved_issue = #{query.involvedIssue}
+            <if test="query.involvedIssue != null and query.involvedIssue != '' and query.involvedIssue.size() > 0">
+                and involved_issue in
+                <foreach collection="query.involvedIssue" item="data" open="(" close=")" separator=",">
+                    #{data}
+                </foreach>
             </if>
             <if test="query.thingDesc != null and query.thingDesc != ''">
                 and thingDesc like concat('%',#{query.thingDesc,jdbcType=VARCHAR},'%')
@@ -144,8 +150,11 @@
             <if test = "query.originId != null and query.originId != '' ">
                 and originId like concat('%',#{query.originId,jdbcType=VARCHAR},'%')
             </if>
-            <if test="query.involvedIssue != null and query.involvedIssue != ''">
-                and involved_issue = #{query.involvedIssue}
+            <if test="query.involvedIssue != null and query.involvedIssue != '' and query.involvedIssue.size() > 0">
+                and involved_issue in
+                <foreach collection="query.involvedIssue" item="data" open="(" close=")" separator=",">
+                    #{data}
+                </foreach>
             </if>
             <if test="query.distributionState != null and query.distributionState != ''">
                 and distribution_state = #{query.distributionState}