From a0776cc4426f0152052124040c7472c104f18afe Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 14 Dec 2021 11:09:39 +0800
Subject: [PATCH] yyyy-MM-dd

---
 .../dto/form/demand/CategoryAnalysisFormDTO.java |  4 ++--
 .../dto/form/demand/PageListAnalysisFormDTO.java |  4 ++--
 .../main/resources/mapper/IcUserDemandRecDao.xml | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java
index 30605910cf..2e564db7cc 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java
@@ -25,9 +25,9 @@ public class CategoryAnalysisFormDTO implements Serializable {
 
     @NotBlank(message = "组织:agency,网格：grid", groups = AddUserShowGroup.class)
     private String orgType;
-    @NotBlank(message = "起止日期不能为空,格式yyyyMMdd", groups = AddUserShowGroup.class)
+    @NotBlank(message = "起止日期不能为空,格式yyyy-MM-dd", groups = AddUserShowGroup.class)
     private String startDateId;
-    @NotBlank(message = "截止日期不能为空,格式yyyyMMdd", groups = AddUserShowGroup.class)
+    @NotBlank(message = "截止日期不能为空,格式yyyy-MM-dd", groups = AddUserShowGroup.class)
     private String endDateId;
 
     @NotBlank(message = "先选择组织或网格", groups = AddUserInternalGroup.class)
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java
index b48063a722..464d1062a8 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java
@@ -35,9 +35,9 @@ public class PageListAnalysisFormDTO implements Serializable {
 
     @NotBlank(message = "分类编码不能为空", groups = AddUserInternalGroup.class)
     private String categoryCode;
-    @NotBlank(message = "上报时间起始日期不能为空,格式yyyyMMdd", groups = AddUserInternalGroup.class)
+    @NotBlank(message = "上报时间起始日期不能为空,格式yyyy-MM-dd", groups = AddUserInternalGroup.class)
     private String startDateId;
-    @NotBlank(message = "上报时间截止日期不能为空,格式yyyyMMdd", groups = AddUserInternalGroup.class)
+    @NotBlank(message = "上报时间截止日期不能为空,格式yyyy-MM-dd", groups = AddUserInternalGroup.class)
     private String endDateId;
 
     @NotBlank(message = "tokenDto中的customerId不能为空",groups = AddUserInternalGroup.class)
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index ae5a8f6223..69dfd04d84 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -254,10 +254,10 @@
         </if>
 
         <if test=" null != startDateId and startDateId != '' ">
-            AND DATE_FORMAT(r.REPORT_TIME,'%Y%m%d') <![CDATA[ >= ]]> #{startDateId}
+            AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{startDateId}
         </if>
         <if test="null != endDateId and endDateId != '' ">
-            AND DATE_FORMAT(r.REPORT_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endDateId}
+            AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDateId}
         </if>
         order by r.WANT_SERVICE_TIME desc,r.REPORT_TIME asc
     </select>
@@ -295,8 +295,8 @@
             <if test="null != orgType and orgType == 'agency' ">
                 and m.GRID_PIDS  like concat(#{gridPids},'%')
             </if>
-            and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &gt;= #{startDateId}
-            and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &lt;= #{endDateId}
+            and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &gt;= #{startDateId}
+            and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &lt;= #{endDateId}
             and m.CATEGORY_CODE like concat(#{category.value},'%')
             and m.status !='canceled'
         </foreach>
@@ -328,8 +328,8 @@
         <if test="null != orgType and orgType == 'agency' ">
             and m.GRID_PIDS  like concat(#{gridPids},'%')
         </if>
-        and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &gt;= #{startDateId}
-        and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &lt;= #{endDateId}
+        and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &gt;= #{startDateId}
+        and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &lt;= #{endDateId}
         and m.CATEGORY_CODE like concat(#{categoryCode},'%')
         group by s.SERVICE_TYPE
 
@@ -352,8 +352,8 @@
         <if test="null != orgType and orgType == 'agency' ">
             and m.GRID_PIDS  like concat(#{gridPids},'%')
         </if>
-        and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &gt;= #{startDateId}
-        and DATE_FORMAT(m.REPORT_TIME,'%Y%m%d') &lt;= #{endDateId}
+        and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &gt;= #{startDateId}
+        and DATE_FORMAT(m.REPORT_TIME,'%Y-%m-%d') &lt;= #{endDateId}
         and m.CATEGORY_CODE like concat(#{categoryCode},'%')
     </select>