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/EimsEquServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 5ddfc59..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
@@ -46,8 +46,16 @@
* @return 銆愯澶囧彴璐︺��
*/
@Override
- public EimsEquVo queryById(Long equId){
+ public EimsEquVo queryById(Long equId) {
return baseMapper.selectVoById(equId);
+ }
+
+ @Override
+ public EimsEquVo queryByAssetNo(String assetNo) {
+ LambdaQueryWrapper<EimsEqu> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(EimsEqu::getAssetNo, assetNo.trim());
+ EimsEquVo eimsEquVo = baseMapper.selectVoOne(lqw);
+ return eimsEquVo;
}
/**
@@ -87,7 +95,15 @@
*/
if (equTypeId != null && equTypeId > 0) {
List<Long> allDescendantIds = getAllDescendantIds(equTypeId);
- lqw.in(EimsEqu::getEquTypeId,allDescendantIds);
+ 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());
@@ -112,11 +128,14 @@
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;
}
/**
* 鏍规嵁id锛岃幏鍙栨墍鏈夊悗浠d
+ *
* @param rootId
* @return
*/
@@ -140,6 +159,7 @@
}
}
}
+
/**
* 鏂板銆愯澶囧彴璐︺��
*
@@ -173,7 +193,7 @@
/**
* 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
*/
- private void validEntityBeforeSave(EimsEqu entity){
+ private void validEntityBeforeSave(EimsEqu entity) {
//TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
}
@@ -186,7 +206,7 @@
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
- if(isValid){
+ if (isValid) {
//TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
}
return baseMapper.deleteByIds(ids) > 0;
--
Gitblit v1.9.3