From fecaf0050852d71e42444e2216a8844474f0de29 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期五, 10 四月 2026 14:18:20 +0800
Subject: [PATCH] fix: 1.储丝单柜卷包产量处理包装机换班后产量不清零导致重复计算问题（2026.04.04后数据新增dac_up_time生效） 2.前端请求超时时间修改为20s
---
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/service/impl/FeedmatchTimeDataServiceImpl.java | 11 ++++++++++-
1 files changed, 10 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..b027bb6 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
@@ -1,5 +1,6 @@
package org.dromara.qa.analy.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -27,6 +28,7 @@
* @author zhuguifei
* @date 2026-03-02
*/
+@DS("master")
@Slf4j
@RequiredArgsConstructor
@Service
@@ -74,7 +76,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;
}
@@ -130,4 +134,9 @@
}
return baseMapper.deleteByIds(ids) > 0;
}
+
+ @Override
+ public FeedmatchTimeData selectOne(LambdaQueryWrapper<FeedmatchTimeData> lqw) {
+ return baseMapper.selectOne(lqw);
+ }
}
--
Gitblit v1.9.3