From ac7e7c6faef1713e87ea623caf63515f7a114f22 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Fri, 13 Mar 2026 18:27:25 +0800 Subject: [PATCH] =?UTF-8?q?fix--=E9=80=9A=E6=8A=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/SuperviseReportQueryParam.java | 10 ++++++++++ .../supervision/service/SuperviseReportService.java | 3 +++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/com/biutag/supervision/pojo/param/SuperviseReportQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/SuperviseReportQueryParam.java index 1647c67..3720ae6 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/SuperviseReportQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/SuperviseReportQueryParam.java @@ -1,7 +1,13 @@ package com.biutag.supervision.pojo.param; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @Setter @Getter @@ -16,4 +22,8 @@ public class SuperviseReportQueryParam extends BasePage{ private String deptId; private Integer type; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private List crtTime = new ArrayList<>(); } diff --git a/src/main/java/com/biutag/supervision/service/SuperviseReportService.java b/src/main/java/com/biutag/supervision/service/SuperviseReportService.java index c604883..cebf20a 100644 --- a/src/main/java/com/biutag/supervision/service/SuperviseReportService.java +++ b/src/main/java/com/biutag/supervision/service/SuperviseReportService.java @@ -57,6 +57,9 @@ public class SuperviseReportService extends ServiceImpl orgIds = departService.getAllNodeIds(queryParam.getDeptId()); queryWrapper.in("t.crt_depart_id", orgIds); } + if (CollectionUtil.isNotEmpty(queryParam.getCrtTime())){ + queryWrapper.between("t.crt_time", queryParam.getCrtTime().get(0), queryParam.getCrtTime().get(1)); + } //查询条件 queryWrapper .eq(Objects.nonNull(queryParam.getType()), "t.type", queryParam.getType())