From 453f63fd6cd6466222304df619e62b3a5667ca68 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 05 八月 2025 13:56:47 +0800
Subject: [PATCH] 修复0730测试问题
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java
index d37a7ba..632ef5b 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java
@@ -27,7 +27,6 @@
import org.dromara.system.domain.SysDept;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.mapper.SysDeptMapper;
-import org.redisson.misc.LogHelper;
import org.springframework.stereotype.Service;
import org.dromara.eims.domain.bo.EimsRepairResBo;
import org.dromara.eims.service.IEimsRepairResService;
@@ -328,6 +327,16 @@
return TableDataInfo.build(page);
}
+ @Override
+ public Integer listUnfinished(String status) {
+ // 鏍规嵁宸ュ崟鐘舵�佹煡璇㈡�绘暟
+ if (!status.isEmpty()) {
+ List<String> statusList = Arrays.asList(status.split(","));
+ return baseMapper.listUnfinished(statusList);
+ }
+ return 0;
+ }
+
private QueryWrapper<EimsRepairRes> buildWrapper(EimsRepairResBo bo) {
Map<String, Object> params = bo.getParams();
QueryWrapper<EimsRepairRes> qw = Wrappers.query();
@@ -338,7 +347,6 @@
qw.eq(bo.getReqUser() != null, "res.req_user", bo.getReqUser());
qw.eq(bo.getAssetNo() != null, "equ.asset_no", bo.getAssetNo());
qw.eq(bo.getEquId() != null, "req.equ_id", bo.getEquId());
-
qw.between(params.get("beginReqTime") != null && params.get("endReqTime") != null,
"req.req_time", params.get("beginReqTime"), params.get("endReqTime"));
@@ -347,7 +355,20 @@
List<Long> reqDeptIds = getAllDescendantIds(bo.getReqDept());
qw.in(bo.getReqDept() != null, "res.req_dept", reqDeptIds);
+ if (params.get("searchValue") != null && StringUtils.isNotBlank(params.get("searchValue").toString())) {
+ qw.and( wq ->wq.like("equ.equ_name", params.get("searchValue"))
+ .or().like("equ.asset_no", params.get("searchValue"))
+ );
+ }
+ /**
+ * *******************
+ */
+ qw.like(StringUtils.isNotBlank(bo.getReqDesc()), "req.req_desc", bo.getReqDesc());
+ qw.like(StringUtils.isNotBlank(bo.getResHandle()), "res.res_handle", bo.getResHandle());
+ /**
+ * *******************
+ */
qw.eq(StringUtils.isNotBlank(bo.getStatus()), "res.status", bo.getStatus());
String s = params.get("status") == null ? "" : params.get("status").toString();
--
Gitblit v1.9.3