From 4d18b86da9410b944968c05d6664ba6324c10635 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 22 七月 2025 10:33:34 +0800
Subject: [PATCH] 设备维修领取备件环节消息推送适配现场调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 ff8aa8b..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
@@ -28,6 +28,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -61,7 +62,8 @@
queryWrapper.in("e.equipment_code", equipArr);
} else {
//娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
- queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId()); }
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
+ }
if(eamMaintenanceStandard != null) {
//缂栫爜 妯＄硦鏌ヨ
if(StringUtils.isNotBlank(eamMaintenanceStandard.getStandardCode())) {
@@ -84,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");
@@ -275,11 +275,19 @@
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);
return pageData.getRecords();
}
+
+ @Override
+ public List<EamMaintenanceStandard> queryListByCategory(String maintenanceCategory) {
+ LambdaQueryWrapper<EamMaintenanceStandard> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamMaintenanceStandard::getDelFlag, CommonConstant.DEL_FLAG_0);
+ queryWrapper.eq(EamMaintenanceStandard::getMaintenanceCategory, maintenanceCategory);
+ queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.NORMAL.name());
+ return eamMaintenanceStandardMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.9.3