From 6ad30ac09210149093cc840f408ed854baa99e30 Mon Sep 17 00:00:00 2001 From: renzexin Date: Fri, 23 Aug 2024 16:22:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=A0=85=E7=9B=AE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chushang/inspection/project/query/ProjectQuery.java | 2 +- .../inspection/project/controller/WrkProjectController.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/ProjectQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/ProjectQuery.java index ab02f2a..0414441 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/ProjectQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/ProjectQuery.java @@ -40,7 +40,7 @@ public class ProjectQuery extends CommonParam { */ @Condition(name = "create_time", type = Condition.ConditionType.between,tableName = "wrk_info") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN) - private List createTimes; + private List createTimes; /** * 项目状态 */ diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java index 3fa2cb5..92cab75 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java @@ -186,6 +186,8 @@ public class WrkProjectController { @RequiresPermissions("inspection:project:info") public AjaxResult projectData(ProjectQuery projectQuery) { + List createTimes = projectQuery.getCreateTimes(); + projectQuery.setCreateTimes(extendTimeRange(createTimes, " 00:00:00", " 23:59:59")); return AjaxResult.success(projectService.projectData(projectQuery)); }