From 997997b0f81ffe5e06484665ed814f7a1fea62ce Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Thu, 19 May 2022 18:15:30 +0800
Subject: [PATCH] =?UTF-8?q?ic=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=EF=BC=9A=E5=85=A5=E5=8F=82=E6=97=B6=E9=97=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=97=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/EventProcessAnalysisCommonFormDTO.java | 8 ++++----
 .../epmet/dto/form/ProcessAnalysisEventListFormDTO.java   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventProcessAnalysisCommonFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventProcessAnalysisCommonFormDTO.java
index 46fda33939..4a8ffb9f3b 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventProcessAnalysisCommonFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventProcessAnalysisCommonFormDTO.java
@@ -44,16 +44,16 @@ public class EventProcessAnalysisCommonFormDTO {
     /**
      * 查询起始时间 yyyy-MM-dd
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "查询时间为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class })
     private Date queryStartTime;
 
     /**
      * 查询截止时间 yyyy-MM-dd
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "查询时间为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class })
     private Date queryEndTime;
 
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessAnalysisEventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessAnalysisEventListFormDTO.java
index c7b9026a65..45e3cf5d21 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessAnalysisEventListFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessAnalysisEventListFormDTO.java
@@ -24,13 +24,13 @@ public class ProcessAnalysisEventListFormDTO {
     /**
      * 查询起始时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "查询时间为必填项")
     private Date queryStartTime;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "查询时间为必填项")
     private Date queryEndTime;