From 245cfffbbc8d96333eccf40885e6fdeeb0ed636e Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 20 六月 2025 14:18:54 +0800
Subject: [PATCH] feat(eims): 添加未完成维修工单数量查询功能,优化搜索设备、保养、点检、维修查询，增加关键字模糊查询
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java
index 5c4ace9..1e7eb28 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java
@@ -53,8 +53,9 @@
@Override
public EimsEquVo queryByAssetNo(String assetNo) {
LambdaQueryWrapper<EimsEqu> lqw = new LambdaQueryWrapper<>();
- lqw.eq(EimsEqu::getAssetNo, assetNo);
- return baseMapper.selectVoOne(lqw);
+ lqw.eq(EimsEqu::getAssetNo, assetNo.trim());
+ EimsEquVo eimsEquVo = baseMapper.selectVoOne(lqw);
+ return eimsEquVo;
}
/**
@@ -96,6 +97,14 @@
List<Long> allDescendantIds = getAllDescendantIds(equTypeId);
lqw.in(EimsEqu::getEquTypeId, allDescendantIds);
}
+ if (params.get("searchValue") != null && StringUtils.isNotBlank(params.get("searchValue").toString())) {
+ // 濡傛灉鎼滅储鍊间笉涓虹┖锛屽垯鎸夎澶囧悕绉般�佽祫浜х紪鍙疯繘琛屾ā绯婃煡璇�
+ lqw.and(wrapper -> {
+ wrapper.like(EimsEqu::getEquName, params.get("searchValue"))
+ .or()
+ .like(EimsEqu::getAssetNo, params.get("searchValue"));
+ });
+ }
lqw.like(StringUtils.isNotBlank(bo.getEquName()), EimsEqu::getEquName, bo.getEquName());
lqw.eq(StringUtils.isNotBlank(bo.getModelNo()), EimsEqu::getModelNo, bo.getModelNo());
@@ -119,6 +128,8 @@
lqw.eq(bo.getServiceLife() != null, EimsEqu::getServiceLife, bo.getServiceLife());
lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
EimsEqu::getDeployDate, params.get("beginTime"), params.get("endTime"));
+ // 鎸夊垱寤烘棩鏈熷�掑簭
+ lqw.orderByDesc(EimsEqu::getCreateTime);
return lqw;
}
--
Gitblit v1.9.3