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 +++++++++++++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java | 11 +++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java | 13 ++++++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java | 2 ++
4 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
index 70448c1..e099e34 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
@@ -267,5 +267,16 @@
return Result.ok("鎵�鏈夋枃浠跺鍏ユ垚鍔燂細" + response);
}
-
+ /**
+ * 鏌ヨ宸插瓨鍦ㄥ彲鐢ㄧ殑鎶�鏈姸鎬侀壌瀹氳鑼冪殑璁惧
+ * @return
+ */
+ @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼�-鏌ヨ宸插瓨鍦ㄥ彲鐢ㄧ殑鎶�鏈姸鎬侀壌瀹氳鑼冪殑璁惧", notes = "鎶�鏈姸鎬侀壌瀹氳鑼�-鏌ヨ宸插瓨鍦ㄥ彲鐢ㄧ殑鎶�鏈姸鎬侀壌瀹氳鑼冪殑璁惧")
+ @GetMapping(value = "/selectEnableEquipment")
+ public Result<?> selectEnableEquipment(@RequestParam(name = "keyword", required = false) String keyword,
+ @RequestParam(name = "equipmentId", required = false) String equipmentId,
+ @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize) {
+ List<EamTechnicalStatusEvaluationStandard> list = eamTechnicalStatusEvaluationStandardService.queryListByKeyword(keyword, equipmentId, pageSize);
+ return Result.OK(list);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
index 070541f..de14e32 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
@@ -86,4 +86,6 @@
private String equipmentName;
@TableField(exist = false)
private String equipmentModel;
+ @TableField(exist = false)
+ private String keyword;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java
index 4e1a8b7..c621279 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java
@@ -8,6 +8,8 @@
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest;
import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
+
/**
* @Description: 鎶�鏈姸鎬侀壌瀹氳鑼�
* @Author: jeecg-boot
@@ -73,4 +75,13 @@
* @return
*/
Result<?> importOtherCheck(MultipartFile file);
+
+ /**
+ * 鏌ヨ宸插瓨鍦ㄥ彲鐢ㄧ殑鎶�鏈姸鎬侀壌瀹氳鑼冪殑璁惧
+ * @param keyword
+ * @param equipmentId
+ * @param pageSize
+ * @return
+ */
+ List<EamTechnicalStatusEvaluationStandard> queryListByKeyword(String keyword, String equipmentId, Integer pageSize);
}
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