From f1b7de2d0bf989ff38b0bd2c52d4bb8b753af42c Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 24 七月 2025 18:13:59 +0800
Subject: [PATCH] 设备维修
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java
index bd34547..cb14634 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java
@@ -10,6 +10,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.util.StrUtil;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
@@ -17,7 +18,9 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.dto.EamReportAccidentsRegisterDto;
+import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamReportAccidentsRegister;
+import org.jeecg.modules.eam.request.EamRepairOrderRequest;
import org.jeecg.modules.eam.request.EamReportAccidentsRegisterQuery;
import org.jeecg.modules.eam.service.IEamReportAccidentsRegisterService;
@@ -117,7 +120,7 @@
// 鏍￠獙棰嗗彇鏉冮檺
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (!BusinessCodeConst.PCR0001.equals(user.getPost())) {
- return Result.error("濉姤澶辫触,娌℃湁濉姤鏉冮檺锛�,璇风櫥褰曟搷浣滃伐宀椾綅鐢ㄦ埛");
+ return Result.error("濉姤澶辫触,娌℃湁濉姤鏉冮檺锛�,闇�鎿嶄綔宸ユ彁浜�");
}
if (eamReportAccidentsRegisterDto == null) {
return Result.error("濉姤鐨勫璞′笉鑳戒负绌猴紒");
@@ -131,6 +134,44 @@
}
}
+ /**
+ * 鎿嶄綔宸ユ彁浜�-鍙戣捣娴佺▼
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "璁惧浜嬫晠鐧昏琛�-鎻愪氦", notes = "璁惧浜嬫晠鐧昏琛�-鎻愪氦")
+ @GetMapping(value = "/submit")
+ public Result<?> submit(String id){
+ // 鏍￠獙棰嗗彇鏉冮檺
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (!BusinessCodeConst.PCR0001.equals(user.getPost())) {
+ return Result.error("鎻愪氦澶辫触,娌℃湁鎻愪氦鏉冮檺锛�,闇�鎿嶄綔宸ユ彁浜�");
+ }
+ eamReportAccidentsRegisterService.submit(id);
+ return Result.OK("鎻愪氦鎴愬姛锛�");
+ }
+
+ /**
+ * 鎴戠殑寰呭姙 鎵ц/瀹℃壒
+ *
+ * @param eamReportAccidentsRegisterDto
+ * @return
+ */
+ @AutoLog(value = "璁惧浜嬫晠鐧昏琛�-鎵ц/瀹℃壒")
+ @ApiOperation(value = "璁惧浜嬫晠鐧昏琛�-鎵ц/瀹℃壒", notes = "璁惧浜嬫晠鐧昏琛�-鎵ц/瀹℃壒")
+ @PostMapping(value = "/perform")
+ public Result<?> perform(@RequestBody EamReportAccidentsRegisterDto eamReportAccidentsRegisterDto) {
+ if (eamReportAccidentsRegisterDto == null) {
+ return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ // 妫�鏌ヨ姹傚弬鏁�
+ if (StrUtil.isBlank(eamReportAccidentsRegisterDto.getTaskId()) || StrUtil.isBlank(eamReportAccidentsRegisterDto.getDataId()) || StrUtil.isBlank(eamReportAccidentsRegisterDto.getInstanceId())) {
+ return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
+ }
+ return eamReportAccidentsRegisterService.audit(eamReportAccidentsRegisterDto);
+ }
+
+
/**
* 閫氳繃id鍒犻櫎
*
--
Gitblit v1.9.3