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/EimsInspectRecordServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java
index 07503f7..a9b17a7 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java
@@ -116,6 +116,11 @@
qw.like(StringUtils.isNotBlank(bo.getInspName()),"ir.insp_name", bo.getInspName());
qw.like(bo.getEquName() != null, "equ.equ_name", bo.getEquName());
qw.like(bo.getAssetNo() != null, "equ.asset_no", bo.getAssetNo());
+ 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(bo.getEquId() != null, "equ.equ_id", bo.getEquId());
qw.eq(StringUtils.isNotBlank(bo.getInspType()), "ir.insp_type", bo.getInspType());
qw.eq(bo.getInspUser() != null, "ir.insp_user", bo.getInspUser());
@@ -244,13 +249,13 @@
@Override
public Boolean updateBatchByBo(InspectRecordBo bo) {
- LoginUser loginUser = LoginHelper.getLoginUser();
+// LoginUser loginUser = LoginHelper.getLoginUser();
List<EimsInspectRecord> inspRecordList = MapstructUtils.convert(bo.getInspRecordList(), EimsInspectRecord.class);
inspRecordList.forEach(item->{
// 鏇存柊涓哄凡鐐规
item.setStatus(DictConstants.EIMS_INSPECT_STATUS_DETAIL.Y);
- item.setInspTime(new Date());
- item.setInspUser(loginUser.getUserId());
+// item.setInspTime(new Date());
+// item.setInspUser(loginUser.getUserId());
});
return baseMapper.updateBatchById(inspRecordList);
}
--
Gitblit v1.9.3