From 576166d68fbf9d5ce20001b8bf6cd926ad35d7a5 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 四月 2025 11:18:26 +0800
Subject: [PATCH] art: 设备管理-保养标准-查询问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index abc92aa..6d30e4b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -86,12 +86,10 @@
queryWrapper.eq("ems.standard_status", eamMaintenanceStandard.getStandardStatus());
}
//璁惧缂栫爜
- if(StringUtils.isNotBlank(eamMaintenanceStandard.getEquipmentCode())) {
- queryWrapper.like("e.equipment_code", eamMaintenanceStandard.getEquipmentCode());
- }
- //璁惧鍚嶇О
- if(StringUtils.isNotBlank(eamMaintenanceStandard.getEquipmentName())) {
- queryWrapper.like("e.equipment_name", eamMaintenanceStandard.getEquipmentName());
+ if(StringUtils.isNotBlank(eamMaintenanceStandard.getKeyword())) {
+ queryWrapper.and(wrapper -> wrapper.like("e.equipment_name", eamMaintenanceStandard.getKeyword())
+ .or()
+ .like("e.equipment_code", eamMaintenanceStandard.getKeyword()));
}
}
queryWrapper.orderByDesc("ems.create_time");
@@ -277,8 +275,7 @@
Page<EamMaintenanceStandard> page = new Page<EamMaintenanceStandard>(1, pageSize);
EamMaintenanceStandard query = new EamMaintenanceStandard();
query.setEquipmentId(equipmentId);
- query.setEquipmentCode(keyword);
- query.setEquipmentName(keyword);
+ query.setKeyword(keyword);
query.setMaintenanceCategory(maintenanceCategory);
query.setStandardStatus(MaintenanceStandardStatusEnum.NORMAL.name());
IPage<EamMaintenanceStandard> pageData = this.queryPageList(page, query);
--
Gitblit v1.9.3