From eafecc3ac0227960f2b8fa377be27f066e10e50f Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 20 五月 2025 10:47:58 +0800
Subject: [PATCH] perf(lb-qms): 优化查询功能和时间范围筛选
---
ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbTestResultServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbTestResultServiceImpl.java b/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbTestResultServiceImpl.java
index d4472b5..e4b0d69 100644
--- a/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbTestResultServiceImpl.java
+++ b/ruoyi-modules/lb-qms/src/main/java/cn/shlanbao/qms/service/impl/LbTestResultServiceImpl.java
@@ -15,6 +15,8 @@
import cn.shlanbao.qms.mapper.LbTestResultMapper;
import cn.shlanbao.qms.service.ILbTestResultService;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.util.*;
/**
@@ -76,6 +78,7 @@
@Override
public List<LbTestResultVo> queryList(LbTestResultBo bo) {
if (StringUtils.isNotBlank(bo.getProdModel())) {
+
return baseMapper.selectByProdModelAndConditions(bo);
} else {
LambdaQueryWrapper<LbTestResult> lqw = buildQueryWrapper(bo);
@@ -116,8 +119,13 @@
lqw.eq(bo.getTestValue() != null, LbTestResult::getTestValue, bo.getTestValue());
lqw.eq(StringUtils.isNotBlank(bo.getJudgeDetail()), LbTestResult::getJudgeDetail, bo.getJudgeDetail());
lqw.eq(StringUtils.isNotBlank(bo.getTestResult()), LbTestResult::getTestResult, bo.getTestResult());
- lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
- LbTestResult::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
+ // 璁剧疆寮�濮嬫椂闂村拰缁撴潫鏃堕棿鐨勬椂鍒嗙
+ if (params.get("beginCreateTime") != null && params.get("endCreateTime") != null) {
+ LocalDateTime beginTime = ((LocalDateTime) params.get("beginCreateTime")).with(LocalTime.MIN);
+ LocalDateTime endTime = ((LocalDateTime) params.get("endCreateTime")).with(LocalTime.MAX);
+ lqw.between(LbTestResult::getCreateTime, beginTime, endTime);
+ }
+
lqw.orderByAsc(LbTestResult::getCreateTime);
return lqw;
}
--
Gitblit v1.9.3