From ef4f769a35eda2e8631b0376f35899e69a13d87f Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 16:20:18 +0800
Subject: [PATCH] fix:时间查询优化

---
 src/main/resources/mapper/report/OrderReportMapper.xml                         |    2 +-
 src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java |    6 +++---
 src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java   |   12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java b/src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java
index b618424..4a9c405 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java
@@ -3,16 +3,16 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Data
 public class SupplierReportCalendarBO {
 
     @ApiModelProperty("下单的开始时间")
-    private LocalDate startDate;
+    private LocalDateTime startDate;
 
     @ApiModelProperty("下单的结束时间")
-    private LocalDate endDate;
+    private LocalDateTime endDate;
 
     @ApiModelProperty(value = "供应商id")
     private Long supplierId;
diff --git a/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
index 3d6bcd6..9a28008 100644
--- a/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
@@ -260,8 +260,8 @@
             throw new ValidationException("日期不能为空");
         }
         supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
-        supplierReportCalendarBO.setStartDate(dto.getStartDate());
-        supplierReportCalendarBO.setEndDate(dto.getEndDate());
+        supplierReportCalendarBO.setStartDate(calculateStartTime(dto.getStartDate().atStartOfDay()));
+        supplierReportCalendarBO.setEndDate(calculateEndTime(dto.getEndDate().atStartOfDay()));
         List<OrderSupplierReportResultVO> list = orderReportMapper.getOrderSupplierPageReport(supplierReportCalendarBO, page);
         page.setRecords(list);
         return page;
@@ -274,8 +274,8 @@
             throw new ValidationException("日期不能为空");
         }
         supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
-        supplierReportCalendarBO.setStartDate(dto.getStartDate());
-        supplierReportCalendarBO.setEndDate(dto.getEndDate());
+        supplierReportCalendarBO.setStartDate(calculateStartTime(dto.getStartDate().atStartOfDay()));
+        supplierReportCalendarBO.setEndDate(calculateEndTime(dto.getEndDate().atStartOfDay()));
         OrderSupplierReportResultVO orderSupplierCountReport = orderReportMapper.getOrderSupplierCountReport(supplierReportCalendarBO);
         return orderSupplierCountReport;
     }
@@ -288,8 +288,8 @@
             throw new ValidationException("日期不能为空");
         }
         supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
-        supplierReportCalendarBO.setStartDate(dto.getStartDate());
-        supplierReportCalendarBO.setEndDate(dto.getEndDate());
+        supplierReportCalendarBO.setStartDate(calculateStartTime(dto.getStartDate().atStartOfDay()));
+        supplierReportCalendarBO.setEndDate(calculateEndTime(dto.getEndDate().atStartOfDay()));
         List<OrderSupplierReportResultVO> list = orderReportMapper.getOrderSupplierReport(supplierReportCalendarBO);
 
         String[] rowsName = new String[]{"序号","日期", "供应商ID", "供应商","花农底价"
diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index 4c5d1b7..03e9ca8 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -490,7 +490,7 @@
             and o.payment_time &lt;= #{dto.endDate}
         </if>
         <if test="dto.supplierId != null">
-            and oi.supplierId &lt;= #{dto.supplierId}
+            and oi.supplierId = #{dto.supplierId}
         </if>
         ) t1
         GROUP BY

--
Gitblit v1.9.3