From 88e10f5656a0ad5530a9e37892fb327153d9dc8a Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 27 六月 2025 13:25:35 +0800
Subject: [PATCH] feat(eims): 优化保养报表状态展示
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
index 4e95350..7f109ea 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java
@@ -95,11 +95,17 @@
qw.eq(bo.getRepairUser() != null, "a.repair_user", bo.getRepairUser());
qw.eq(StringUtils.isNotBlank(bo.getFaultType()), "a,fault_type", bo.getFaultType());
qw.in(params.containsKey("createBy"), "a.create_by", (List<Long>) params.get("createBy"));
- qw.eq(params.containsKey("status"), "a.status", params.get("status"));
+ Object status = params.get("status") == null ? "" : params.get("status");
+ if (params.get("searchValue") != null && StringUtils.isNotBlank(params.get("searchValue").toString())) {
+ qw.and( wq ->wq.like("b.equ_name", params.get("searchValue"))
+ .or().like("b.asset_no", params.get("searchValue"))
+ );
+ }
+ String[] split = status.toString().split(",");
+ qw.in(params.containsKey("status"), "a.status", split);
qw.between(params.get("beginReqTime") != null && params.get("endReqTime") != null,
"a.req_time", params.get("beginReqTime"), params.get("endReqTime"));
-
-
+ qw.ne(StringUtils.isNotBlank(bo.getStatusLt()), "a.status", bo.getStatusLt());
qw.eq(bo.getCreateBy()!=null, "a.create_by", bo.getCreateBy());
qw.eq(StringUtils.isNotEmpty(bo.getStatus()), "a.status", bo.getStatus());
qw.orderByDesc("a.create_time");
--
Gitblit v1.9.3