From 1364b791aeb7877c6f48b24cab88367a87e53460 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 28 九月 2025 13:01:52 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
index b5428c7..11f120d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
@@ -336,7 +336,11 @@
if(i==stockDataSets.size()-1){
// 最后一次
LocalDate endTime = LocalDate.now();
- List<TOrderSale> collect = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) <= 0).collect(Collectors.toList());
+ if(endTime.isBefore(startTime)){
+ endTime = dto.getEndTime();
+ }
+ LocalDate finalEndTime = endTime;
+ List<TOrderSale> collect = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(finalEndTime) <= 0).collect(Collectors.toList());
List<TOrderSaleGoods> orderSaleGoodsList = new ArrayList<>();
collect.forEach(e->orderSaleGoodsList.addAll(e.getOrderSaleGoods()));
// 根据商品新生成一条数据
--
Gitblit v1.7.1