From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java
index 9d47238..7a08329 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java
@@ -11,8 +11,6 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.eam.entity.Equipment;
-import org.jeecg.modules.eam.entity.EquipmentScrapDetail;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -514,15 +512,6 @@
@PostMapping(value = "/approve")
public Result<String> approve(@RequestBody EquipmentDisposal equipmentDisposal) {
equipmentDisposalService.updateById(equipmentDisposal);
- //瀹℃壒閫氳繃鍚庢洿鏂拌澶囩姸鎬�
- if("Approved".equals(equipmentDisposal.getAuditStatus())){
- List<EquipmentDisposalDetail> equipmentDisposalDetailList = equipmentDisposalDetailService.selectByMainId(equipmentDisposal.getId());
- for(EquipmentDisposalDetail equipmentDisposalDetail : equipmentDisposalDetailList){
- Equipment equipment = equipmentService.getById(equipmentDisposalDetail.getEquipmentId());
- equipment.setEquipmentStatus("5");
- equipmentService.updateById(equipment);
- }
- }
return Result.OK("鎿嶄綔鎴愬姛锛�");
}
}
--
Gitblit v1.9.3