From 2f0009c750de4d47a18cce4a5a403fa83ba0c209 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期三, 02 七月 2025 08:58:27 +0800 Subject: [PATCH] feat(report): 新增设备稼动率统计功能 --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairReqServiceImpl.java | 6 +++++- 1 files changed, 5 insertions(+), 1 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 7f17f4c..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 @@ -96,7 +96,11 @@ qw.eq(StringUtils.isNotBlank(bo.getFaultType()), "a,fault_type", bo.getFaultType()); qw.in(params.containsKey("createBy"), "a.create_by", (List<Long>) params.get("createBy")); 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, -- Gitblit v1.9.3