From ef2b7d2d4267d947eb0e9938ea5cc49005bffca8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 27 十月 2025 14:07:15 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index bbcbe80..d03a3d7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -156,7 +156,7 @@
SimpleDateFormat format = new SimpleDateFormat("MM.dd");
for (int i = 0; i < 30; i++) {
LocalDateTime timeNow = localDateTime.plusDays(i);
- List<SupplierThirtyProcurementStatisticsVO> vos = supplierThirtyProcurementStatistics.stream().filter(vo -> Objects.nonNull(vo.getPayTime()) && timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
+ List<SupplierThirtyProcurementStatisticsVO> vos = supplierThirtyProcurementStatistics.stream().filter(vo -> Objects.nonNull(vo.getPayTime()) && timeNow.toLocalDate().equals(vo.getPayTime())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(vos)) {
SupplierThirtyProcurementStatisticsVO vo = new SupplierThirtyProcurementStatisticsVO();
String time = format.format(DateUtils.localDateTimeToDate(timeNow));
@@ -164,7 +164,7 @@
vo.setOrderCount(0);
supplierThirtyProcurementStatistics.add(vo);
}
- List<SupplierThirtyMoneyProcurementStatisticsVO> moneyVOS = supplierThirtyMoneyProcurementStatistics.stream().filter(vo -> Objects.nonNull(vo.getPayTime()) && timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
+ List<SupplierThirtyMoneyProcurementStatisticsVO> moneyVOS = supplierThirtyMoneyProcurementStatistics.stream().filter(vo -> Objects.nonNull(vo.getPayTime()) && timeNow.toLocalDate().equals(vo.getPayTime())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(moneyVOS)) {
SupplierThirtyMoneyProcurementStatisticsVO vo = new SupplierThirtyMoneyProcurementStatisticsVO();
String time = format.format(DateUtils.localDateTimeToDate(timeNow));
@@ -332,7 +332,8 @@
LocalDateTime days = LocalDateTime.now().minusDays(6);
for (int i = 0; i < 7; i++) {
LocalDateTime timeNow = days.plusDays(i);
- List<SupplierSalesStatisticsGoodsCountVO> vos = supplierSalesStatisticsGoodsCountVOS.stream().filter(vo -> timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
+ LocalDate localDate = timeNow.toLocalDate();
+ List<SupplierSalesStatisticsGoodsCountVO> vos = supplierSalesStatisticsGoodsCountVOS.stream().filter(vo -> localDate.equals(vo.getPayTime())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(vos)) {
SupplierSalesStatisticsGoodsCountVO vo = new SupplierSalesStatisticsGoodsCountVO();
String time = format.format(DateUtils.localDateTimeToDate(timeNow));
@@ -484,7 +485,7 @@
LocalDateTime days = LocalDateTime.now().minusDays(6);
for (int i = 0; i < 7; i++) {
LocalDateTime timeNow = days.plusDays(i);
- List<ClinicSalesStatisticsGoodsCountVO> vos = clinicSalesStatisticsGoodsCountVOS.stream().filter(vo -> timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
+ List<ClinicSalesStatisticsGoodsCountVO> vos = clinicSalesStatisticsGoodsCountVOS.stream().filter(vo -> timeNow.toLocalDate().equals(vo.getPayTime())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(vos)) {
ClinicSalesStatisticsGoodsCountVO vo = new ClinicSalesStatisticsGoodsCountVO();
String time = format.format(DateUtils.localDateTimeToDate(timeNow));
--
Gitblit v1.7.1