From 92bc6dca274eb45dc330f63b5a3f90a01458e157 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 27 五月 2025 14:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java
index f4ecc06..8775cfb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java
@@ -18,6 +18,7 @@
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
+import org.jeecg.modules.eam.request.EamEquipmentSealUpRequest;
import org.jeecg.modules.eam.service.IEamEquipmentSealUpService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -175,13 +176,30 @@
}
/**
+ * 鍚皝
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧鍚皝-鍚皝")
+ @ApiOperation(value = "璁惧鍚皝-鍚皝", notes = "璁惧鍚皝-鍚皝")
+ @GetMapping(value = "/unseal")
+ public Result<?> unseal(@RequestParam(name = "id", required = true) String id) {
+ boolean b = eamEquipmentSealUpService.unseal(id);
+ if (!b) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.OK("鎿嶄綔鎴愬姛!");
+ }
+
+ /**
* 鎻愪氦
*
* @param id
* @return
*/
- @AutoLog(value = "璁惧灏佸瓨鍚皝-鎻愪氦")
- @ApiOperation(value = "璁惧灏佸瓨鍚皝-鎻愪氦", notes = "璁惧灏佸瓨鍚皝-鎻愪氦")
+ @AutoLog(value = "璁惧灏佸瓨-鎻愪氦")
+ @ApiOperation(value = "璁惧灏佸瓨-鎻愪氦", notes = "璁惧灏佸瓨-鎻愪氦")
@GetMapping(value = "/submit")
public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
boolean b = eamEquipmentSealUpService.submit(id);
@@ -190,4 +208,24 @@
}
return Result.OK("鎿嶄綔鎴愬姛!");
}
+
+ /**
+ * 瀹℃壒娴�
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "鍚皝灏佸瓨-瀹℃壒娴�")
+ @ApiOperation(value = "鍚皝灏佸瓨-瀹℃壒娴�", notes = "鍚皝灏佸瓨-瀹℃壒娴�")
+ @RequestMapping(value = "/approval", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> approval(@RequestBody EamEquipmentSealUpRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ EamEquipmentSealUp entity = eamEquipmentSealUpService.approval(request);
+ if (entity == null) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.OK("鎿嶄綔鎴愬姛!");
+ }
}
--
Gitblit v1.9.3