From 9ca97fd558700e7054c5f54192a9db7a1e6b8230 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 16:31:47 +0800
Subject: [PATCH] 完善导出等接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
index f52f708..156ac73 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
@@ -12,10 +12,12 @@
import com.ruoyi.system.dto.TOrderSaleDTO;
import com.ruoyi.system.dto.TOrderStockDTO;
import com.ruoyi.system.mapper.TOrderStockMapper;
+import com.ruoyi.system.query.TDataGeneratorQuery;
import com.ruoyi.system.query.TDataGeneratorStockQuery;
import com.ruoyi.system.query.TOrderStockQuery;
import com.ruoyi.system.service.TOrderStockGoodsService;
import com.ruoyi.system.service.TOrderStockService;
+import com.ruoyi.system.vo.TDataGeneratorVO;
import com.ruoyi.system.vo.TOrderStockVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -84,23 +86,23 @@
switch (query.getTimeType()){
case 1:
// 今日
- startTime = LocalDateTime.MIN;
- endTime = LocalDateTime.MAX;
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
break;
case 2:
// 昨日
- startTime = LocalDateTime.now().minusDays(1);
- endTime = LocalDateTime.now().minusDays(1);
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
break;
case 3:
// 近7天
- startTime = LocalDateTime.now().minusDays(7);
- endTime = LocalDateTime.now();
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
break;
case 4:
// 近30天
- startTime = LocalDateTime.now().minusDays(30);
- endTime = LocalDateTime.now();
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
break;
}
query.setStartTime(DateUtils.localDateTimeToDate(startTime));
@@ -138,23 +140,23 @@
switch (query.getTimeType()){
case 1:
// 今日
- startTime = LocalDateTime.MIN;
- endTime = LocalDateTime.MAX;
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
break;
case 2:
// 昨日
- startTime = LocalDateTime.now().minusDays(1);
- endTime = LocalDateTime.now().minusDays(1);
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
break;
case 3:
// 近7天
- startTime = LocalDateTime.now().minusDays(7);
- endTime = LocalDateTime.now();
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
break;
case 4:
// 近30天
- startTime = LocalDateTime.now().minusDays(30);
- endTime = LocalDateTime.now();
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
break;
}
query.setStartTime(DateUtils.localDateTimeToDate(startTime));
--
Gitblit v1.7.1