From 8904f9e6005e7e1f3cc06f415fdcde0033c32332 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 七月 2025 20:33:53 +0800
Subject: [PATCH] art: 技术状态鉴定工单-生成逻辑优化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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..2983990 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
@@ -10,7 +10,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardEnum;
+import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService;
@@ -160,7 +160,7 @@
public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
EamTechnicalStatusEvaluationStandard entity = eamTechnicalStatusEvaluationStandardService.getById(id);
if (entity != null) {
- entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name());
+ entity.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name());
eamTechnicalStatusEvaluationStandardService.updateById(entity);
}
return Result.OK("鎻愪氦鎴愬姛!");
@@ -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);
+ }
}
--
Gitblit v1.9.3