From c425a8afba0a76eb62d5650cc9c98c42d8339f06 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期四, 12 三月 2026 13:01:23 +0800
Subject: [PATCH] perf: 1.优化储丝柜单柜卷包产量计算方式，支持未出料结束计算统计 2.新增储丝柜单柜卷包产量桑基图
---
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/FeedmatchTimeDataServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/FeedmatchTimeDataServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/FeedmatchTimeDataServiceImpl.java
index 4095578..b9c1689 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/FeedmatchTimeDataServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/FeedmatchTimeDataServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.dromara.qa.analy.domain.StoreSilkInfo;
import org.springframework.stereotype.Service;
import org.dromara.qa.analy.domain.bo.FeedmatchTimeDataBo;
import org.dromara.qa.analy.domain.vo.FeedmatchTimeDataVo;
@@ -74,7 +75,9 @@
private LambdaQueryWrapper<FeedmatchTimeData> buildQueryWrapper(FeedmatchTimeDataBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<FeedmatchTimeData> lqw = Wrappers.lambdaQuery();
- lqw.eq(bo.getTime() != null, FeedmatchTimeData::getTime, bo.getTime());
+ lqw.eq(bo.getShift() != null, FeedmatchTimeData::getShift, bo.getShift());
+ lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+ FeedmatchTimeData::getTime, params.get("beginTime"), params.get("endTime"));
lqw.eq(StringUtils.isNotBlank(bo.getKey()), FeedmatchTimeData::getKey, bo.getKey());
return lqw;
}
--
Gitblit v1.9.3