From d5303c9630a8db16bb206416b42f0baa2a267a8c Mon Sep 17 00:00:00 2001 From: pengwei Date: Tue, 26 Aug 2025 10:29:59 +0800 Subject: [PATCH] =?UTF-8?q?fit:1=E3=80=81=E6=A1=88=E4=BB=B6=E6=A0=B8?= =?UTF-8?q?=E6=9F=A5=E3=80=81=E4=BF=A1=E8=AE=BF=E6=8A=95=E8=AF=89=E3=80=81?= =?UTF-8?q?=E5=85=AC=E5=AE=89=E9=83=A8&=E5=9B=BD=E5=AE=B6=E4=BF=A1?= =?UTF-8?q?=E8=AE=BF=20=E6=B6=89=E4=BC=81=E6=B6=89=E5=86=BB=E5=A4=9A?= =?UTF-8?q?=E9=80=89=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/DataCaseVerifQueryParam.java | 2 +- .../DataPetitionComplaintQueryParam.java | 2 +- .../pojo/param/DataThreadQueryParam.java | 2 +- .../service/DataCaseVerifService.java | 3 ++- .../service/DataPetitionComplaintService.java | 3 ++- .../service/DataThreadService.java | 4 ++++ .../resources/mapper/DataThreadMapper.xml | 21 +++++++++++++------ 7 files changed, 26 insertions(+), 11 deletions(-) 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}