diff --git a/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java index f53ae57..cd10269 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java +++ b/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 involvedIssue; // 问题发现时间 diff --git a/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java index 17c0166..d92d944 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/DataPetitionComplaintQueryParam.java +++ b/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 involvedIssue; } diff --git a/src/main/java/com/biutag/supervision/pojo/param/DataThreadQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/DataThreadQueryParam.java index 812a0c8..07d30b7 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/DataThreadQueryParam.java +++ b/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 involvedIssue; //具体内容 private String thingDesc; //是否分发 diff --git a/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java b/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java index 2c4e681..14ebacd 100644 --- a/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java +++ b/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()); + } return Result.success(dataMailboxService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), wrapper)); } else{ LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .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) { diff --git a/src/main/resources/mapper/DataThreadMapper.xml b/src/main/resources/mapper/DataThreadMapper.xml index 29043d0..4a8cdee 100644 --- a/src/main/resources/mapper/DataThreadMapper.xml +++ b/src/main/resources/mapper/DataThreadMapper.xml @@ -34,8 +34,11 @@ and origin_id like concat('%',#{query.originId,jdbcType=VARCHAR},'%') - - and involved_issue = #{query.involvedIssue} + + and involved_issue in + + #{data} + and thing_desc like concat('%',#{query.thingDesc,jdbcType=VARCHAR},'%') @@ -92,8 +95,11 @@ and origin_id like concat('%',#{query.originId,jdbcType=VARCHAR},'%') - - and involved_issue = #{query.involvedIssue} + + and involved_issue in + + #{data} + and thingDesc like concat('%',#{query.thingDesc,jdbcType=VARCHAR},'%') @@ -144,8 +150,11 @@ and originId like concat('%',#{query.originId,jdbcType=VARCHAR},'%') - - and involved_issue = #{query.involvedIssue} + + and involved_issue in + + #{data} + and distribution_state = #{query.distributionState}