From 875adbd59a28453cdf443c3244e2691ad1dd02ac Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 17 九月 2026 00:13:08 +0800
Subject: [PATCH] fix: 产品父类名称适配
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index eaf062b..500b934 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -1088,26 +1088,17 @@
@Override
public List<Map<String, Object>> productInOutAnalysis(Integer type) {
- String targetName;
+ // 0-鍘熸潗鏂� 1-鍗婃垚鍝� 2-鎴愬搧
+ Integer modelType;
if (type == 1) {
- targetName = "鍘熸潗鏂�";
+ modelType = 0;
} else if (type == 2) {
- targetName = "鎴愬搧";
+ modelType = 2;
} else if (type == 3) {
- targetName = "鍗婃垚鍝�";
+ modelType = 1;
} else {
return new ArrayList<>();
}
-
- LambdaQueryWrapper<Product> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Product::getProductName, targetName).isNull(Product::getParentId);
- Product rootCategory = productMapper.selectOne(queryWrapper);
-
- if (rootCategory == null) {
- log.warn("鏈壘鍒板悕绉颁负 {} 鐨勯《绾т骇鍝佸垎绫�", targetName);
- return new ArrayList<>();
- }
- Long rootCategoryId = rootCategory.getId();
LocalDate now = LocalDate.now();
DateTimeFormatter displayDtf = DateTimeFormatter.ofPattern("M/d");
@@ -1115,10 +1106,10 @@
String startDate = now.minusDays(6).toString();
String endDate = now.toString();
- List<Map<String, Object>> inCounts = stockInventoryMapper.selectDailyStockInCounts(rootCategoryId, startDate,
+ List<Map<String, Object>> inCounts = stockInventoryMapper.selectDailyStockInCounts(modelType, startDate,
endDate + " 23:59:59");
- List<Map<String, Object>> outCounts = stockInventoryMapper.selectDailyStockOutCounts(rootCategoryId, startDate,
+ List<Map<String, Object>> outCounts = stockInventoryMapper.selectDailyStockOutCounts(modelType, startDate,
endDate + " 23:59:59");
Map<LocalDate, BigDecimal> inMap = inCounts.stream()
--
Gitblit v1.9.3