From 4958e2592279bfb1dd3e3ee9ce39999cf461c832 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 11 七月 2025 14:24:23 +0800
Subject: [PATCH] art: 查询可用技术状态鉴定规范
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
index 8bb7a21..51d0233 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
@@ -105,9 +105,16 @@
queryWrapper.eq("ems.equipment_id", query.getEquipmentId());
}
- //淇濆吇鍒嗙被
+ //瑙勮寖鐘舵��
if (StringUtils.isNotBlank(query.getStandardStatus())) {
queryWrapper.eq("ems.standard_status", query.getStandardStatus());
+ }
+
+ //璁惧缂栫爜
+ if (StringUtils.isNotBlank(query.getKeyword())) {
+ queryWrapper.and(wrapper -> wrapper.like("e.equipment_name", query.getKeyword())
+ .or()
+ .like("e.equipment_code", query.getKeyword()));
}
}
queryWrapper.orderByDesc("ems.create_time");
@@ -540,6 +547,17 @@
return Result.OK(fileName + ":瀵煎叆鎴愬姛锛�");
}
+ @Override
+ public List<EamTechnicalStatusEvaluationStandard> queryListByKeyword(String keyword, String equipmentId, Integer pageSize) {
+ Page<EamTechnicalStatusEvaluationStandard> page = new Page<>(1, pageSize);
+ EamTechnicalStatusEvaluationStandard query = new EamTechnicalStatusEvaluationStandard();
+ query.setEquipmentId(equipmentId);
+ query.setKeyword(keyword);
+ query.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name());
+ IPage<EamTechnicalStatusEvaluationStandard> pageData = this.queryPageList(page, query);
+ return pageData.getRecords();
+ }
+
/**
* 妫�鏌ュ鍏ユ枃浠跺垎绫绘槸鍚﹀尮閰�
* @param title 鏍囬娈佃惤瀛楃涓�
--
Gitblit v1.9.3