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/EquipmentSealController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentSealController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentSealController.java
index 7027fb4..1cc0bc2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentSealController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentSealController.java
@@ -8,6 +8,8 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.eam.entity.Equipment;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EquipmentDisposalPage;
import org.jeecg.modules.eam.vo.EquipmentSealPage;
//import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
@@ -64,6 +66,9 @@
@Autowired
private IEquipmentSealDetailService equipmentSealDetailService;
+
+ @Autowired
+ private IEamEquipmentService equipmentService;
// @Autowired
// private IFlowMyBusinessService flowMyBusinessService;
@@ -520,6 +525,15 @@
@PostMapping(value = "/approve")
public Result<String> approve(@RequestBody EquipmentSeal equipmentSeal) {
equipmentSealService.updateById(equipmentSeal);
+ //瀹℃壒閫氳繃鍚庢洿鏂拌澶囩姸鎬�
+ if("Approved".equals(equipmentSeal.getAuditStatus())){
+ List<EquipmentSealDetail> equipmentSealDetailList = equipmentSealDetailService.selectByMainId(equipmentSeal.getId());
+ for(EquipmentSealDetail equipmentSealDetail : equipmentSealDetailList){
+ Equipment equipment = equipmentService.getById(equipmentSealDetail.getEquipmentId());
+ equipment.setEquipmentStatus("2");
+ equipmentService.updateById(equipment);
+ }
+ }
return Result.OK("鎿嶄綔鎴愬姛锛�");
}
--
Gitblit v1.9.3