From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateApplyController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateApplyController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateApplyController.java
index 336cd01..8cf04b3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateApplyController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateApplyController.java
@@ -12,6 +12,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.jeecg.modules.eam.vo.EquipmentDisposalPage;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -100,22 +101,22 @@
/**
* 缂栬緫
*
- * @param operationCertificateApplyPage
+ * @param operationCertificateApply
* @return
*/
@AutoLog(value = "鎿嶄綔璇佺敵璇疯〃-缂栬緫")
@ApiOperation(value="鎿嶄綔璇佺敵璇疯〃-缂栬緫", notes="鎿嶄綔璇佺敵璇疯〃-缂栬緫")
//@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_operation_certificate_apply:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody OperationCertificateApplyPage operationCertificateApplyPage) {
- OperationCertificateApply operationCertificateApply = new OperationCertificateApply();
- BeanUtils.copyProperties(operationCertificateApplyPage, operationCertificateApply);
+ public Result<String> edit(@RequestBody OperationCertificateApply operationCertificateApply) {
+// OperationCertificateApply operationCertificateApply = new OperationCertificateApply();
+// BeanUtils.copyProperties(operationCertificateApplyPage, operationCertificateApply);
OperationCertificateApply operationCertificateApplyEntity = operationCertificateApplyService.getById(operationCertificateApply.getId());
if(operationCertificateApplyEntity==null) {
return Result.error("鏈壘鍒板搴旀暟鎹�");
}
- operationCertificateApplyService.updateMain(operationCertificateApply, operationCertificateApplyPage.getOperationCertificateApplyDetailList());
- return Result.OK("缂栬緫鎴愬姛!");
+ operationCertificateApplyService.updateMain(operationCertificateApply, operationCertificateApply.getOperationCertificateApplyDetailList());
+ return Result.OK("瀹℃牳鎴愬姛!");
}
/**
@@ -262,4 +263,17 @@
return Result.OK("鏂囦欢瀵煎叆澶辫触锛�");
}
+ /**
+ * 鎻愪氦銆佸鏍搞�佸鎵�
+ *
+ * @param operationCertificateApply
+ * @return
+ */
+ @AutoLog(value = "鎻愪氦銆佸鏍搞�佸鎵�")
+ @PostMapping(value = "/approve")
+ public Result<String> submit(@RequestBody OperationCertificateApply operationCertificateApply) {
+ this.operationCertificateApplyService.updateById(operationCertificateApply);
+ return Result.OK("鎿嶄綔鎴愬姛锛�");
+ }
+
}
--
Gitblit v1.9.3