搜索条件key修改。

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;
 }

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>