From dde6df3f22f9f753433c5d3b8bed4ea45d473ca2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Nov 2021 16:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6key?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/demand/UserDemandPageFormDTO.java   |  8 ++++----
 .../main/resources/mapper/IcUserDemandRecDao.xml | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java
index 265a88b5f1..82dd913b31 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandPageFormDTO.java
@@ -43,13 +43,13 @@ public class UserDemandPageFormDTO extends PageFormDTO implements Serializable {
      * 上报时间开始
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date reportStartDate;
+    private Date reportStartTime;
 
     /**
      * 上报时间截止
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date reportEndDate;
+    private Date reportEndTime;
 
     /**
      * 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished
@@ -73,11 +73,11 @@ public class UserDemandPageFormDTO extends PageFormDTO implements Serializable {
      * 希望服务时间开始
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date wantServiceStartDate;
+    private Date wantServiceStartTime;
 
     /**
      * 希望截止
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date wantServiceEndDate;
+    private Date wantServiceEndTime;
 }
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 33d471906e..72ac018284 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
@@ -93,11 +93,11 @@
             <if test="null != demandUserName and demandUserName !='' ">
                 and r.DEMAND_USER_NAME like concat('%',#{demandUserName},'%')
             </if>
-            <if test=" null != reportStartDate and reportStartDate != '' ">
-                AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{reportStartDate}
+            <if test=" null != reportStartTime and reportStartTime != '' ">
+                AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{reportStartTime}
             </if>
-            <if test="null != reportEndDate and reportEndDate != '' ">
-                AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{reportEndDate}
+            <if test="null != reportEndTime and reportEndTime != '' ">
+                AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{reportEndTime}
             </if>
             <if test="null != status and status != '' ">
                 and r.STATUS=#{status}
@@ -108,11 +108,11 @@
             <if test="null != serverId and serverId != '' ">
                 and s.SERVER_ID=#{serverId}
             </if>
-            <if test=" null != wantServiceStartDate and wantServiceStartDate != '' ">
-                AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{wantServiceStartDate}
+            <if test=" null != wantServiceStartTime and wantServiceStartTime != '' ">
+                AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') <![CDATA[ >= ]]> #{wantServiceStartTime}
             </if>
-            <if test="null != wantServiceEndDate and wantServiceEndDate != '' ">
-                AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{wantServiceEndDate}
+            <if test="null != wantServiceEndTime and wantServiceEndTime != '' ">
+                AND DATE_FORMAT(r.WANT_SERVICE_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{wantServiceEndTime}
             </if>
             order by r.WANT_SERVICE_TIME desc,r.CREATED_TIME asc
     </select>