Browse Source

fix 订单查询页,查询时间问题

skyline 2 years ago
parent
commit
d2f8d66aec

+ 8 - 9
admin-web/src/views/admin/ordering/index.vue

@@ -67,21 +67,20 @@
         </el-input>
         <el-date-picker
             v-model="state.formQuery.startDate"
-            placeholder="充电开始时间"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="开始时间"
+            type="date"
+            value-format="YYYY-MM-DD"
             @on-change="loadData(true)"
             class="wd150 mr10">
         </el-date-picker>
-        <ext-date-picker
+        <el-date-picker
             v-model="state.formQuery.endDate"
-            placeholder="充电结束时间"
-            clearable
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="结束时间"
+            type="date"
+            value-format="YYYY-MM-DD"
             @on-change="loadData(true)"
             class="wd150 mr10">
-        </ext-date-picker>
+        </el-date-picker>
         <ext-d-select
             v-model="state.formQuery.orderStatus"
             type="ChargeOrder.orderStatus"

+ 13 - 0
entity/src/main/java/com/kym/entity/admin/queryParams/CustomChargeOrdersQueryParam.java

@@ -2,7 +2,9 @@ package com.kym.entity.admin.queryParams;
 
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 
 /**
@@ -48,10 +50,21 @@ public class CustomChargeOrdersQueryParam extends PageParams {
      * 支付状态
      */
     private Integer payStatus;
+
+
+    public void setStartDate(LocalDate startDate) {
+        this.startDate = LocalDateTime.of(startDate, LocalTime.MIN);
+    }
+
     /**
      * 查询开始日期
      */
     private LocalDateTime startDate;
+
+    public void setEndDate(LocalDate endDate) {
+        this.endDate =  LocalDateTime.of(endDate, LocalTime.MAX);
+    }
+
     /**
      * 查询结束日期
      */

+ 1 - 1
mapper/src/main/resources/mappers/miniapp/ChargeOrderMapper.xml

@@ -93,7 +93,7 @@
                 and t1.start_time &gt;= #{params.startDate}
             </if>
             <if test="params.endDate != null">
-                and t1.end_time &lt;= #{params.endDate}
+                and t1.start_time &lt;= #{params.endDate}
             </if>
         </where>
     </select>