From 5063781980b46b2aef2427584a870da4110f3a03 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Fri, 3 Apr 2026 17:33:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8A=A0=E4=B8=8A=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComplaintCollection/ComplaintCollectionQueryParam.java | 7 +++++++ .../ComplaintCollectionPageRequest.java | 2 +- .../ComplaintCollectionResourceService.java | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java index dc9307d..d0e2ff7 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java @@ -2,6 +2,7 @@ package com.biutag.supervision.pojo.param.ComplaintCollection; import com.biutag.supervision.pojo.enums.complaintCollection.ComplaintCollectionSourceTableEnum; import com.biutag.supervision.pojo.param.BasePage; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -112,6 +113,12 @@ public class ComplaintCollectionQueryParam extends BasePage { private List involveProblemIdList = new ArrayList<>(); + @Schema(description = "录入时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List createTimeList = new ArrayList<>(); + + + // @Schema(description = "部门ID集合") // private Set secondDepartIds; diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java index 1cdb700..7686ccf 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java @@ -84,7 +84,7 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe @Schema(description = "录入时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private List crtTime = new ArrayList<>(); + private List createTimeList = new ArrayList<>(); @Override diff --git a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java index b6338cf..6ec5044 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -66,6 +66,9 @@ public class ComplaintCollectionResourceService extends BaseDAO { && param.getDiscoveryTimeList().get(1) != null) { qw.between(ComplaintCollection::getDiscoveryTime, param.getDiscoveryTimeList().get(0), param.getDiscoveryTimeList().get(1)); } + if (CollectionUtil.size(param.getCreateTimeList()) == 2){ + qw.between(ComplaintCollection::getCreateTime, param.getCreateTimeList().get(0), param.getCreateTimeList().get(1)); + } // 来件人信息 if (StrUtil.isNotBlank(param.getPersonInfo())) { String kw = param.getPersonInfo();