From 95c90e04b516325648e8a3d69e726555d1f7d05e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 10 九月 2025 14:51:07 +0800
Subject: [PATCH] 设备借用、归还流程审批调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java
index e29add6..6ed9eb7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java
@@ -14,10 +14,10 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamSparePartRequisition;
-import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
+import org.jeecg.modules.eam.entity.EamSparePartRequisitionDetail;
import org.jeecg.modules.eam.request.EamSparePartRequisitionRequest;
+import org.jeecg.modules.eam.service.IEamSparePartRequisitionDetailService;
import org.jeecg.modules.eam.service.IEamSparePartRequisitionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,8 +25,6 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -47,6 +45,9 @@
@Resource
private IEamSparePartRequisitionService eamSparePartRequisitionService;
+ @Resource
+ private IEamSparePartRequisitionDetailService eamSparePartRequisitionDetailService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -65,6 +66,11 @@
QueryWrapper<EamSparePartRequisition> queryWrapper = QueryGenerator.initQueryWrapper(eamSparePartRequisition, req.getParameterMap());
Page<EamSparePartRequisition> page = new Page<EamSparePartRequisition>(pageNo, pageSize);
IPage<EamSparePartRequisition> pageList = eamSparePartRequisitionService.page(page, queryWrapper);
+ for (EamSparePartRequisition record : pageList.getRecords()) {
+ List<EamSparePartRequisitionDetail> details = eamSparePartRequisitionDetailService.lambdaQuery()
+ .eq(EamSparePartRequisitionDetail::getSpareRequisitionId, record.getId()).list();
+ record.setSparePartRequisitionDetails(details);
+ }
return Result.OK(pageList);
}
@@ -82,6 +88,11 @@
String realName = user.getRealname();
eamSparePartRequisition.setReportUser(realName);
eamSparePartRequisitionService.save(eamSparePartRequisition);
+ for (EamSparePartRequisitionDetail sparePartRequisitionDetail : eamSparePartRequisition.getSparePartRequisitionDetails()) {
+ sparePartRequisitionDetail.setSpareRequisitionId(eamSparePartRequisition.getId());
+ eamSparePartRequisitionDetailService.saveOrUpdate(sparePartRequisitionDetail);
+ }
+
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -95,6 +106,18 @@
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody EamSparePartRequisition eamSparePartRequisition) {
eamSparePartRequisitionService.updateById(eamSparePartRequisition);
+
+ List<EamSparePartRequisitionDetail> details = eamSparePartRequisitionDetailService.lambdaQuery()
+ .eq(EamSparePartRequisitionDetail::getSpareRequisitionId, eamSparePartRequisition.getId()).list();
+ for (EamSparePartRequisitionDetail detail : details) {
+ eamSparePartRequisitionDetailService.removeById(detail.getId());
+ }
+
+ for (EamSparePartRequisitionDetail sparePartRequisitionDetail : eamSparePartRequisition.getSparePartRequisitionDetails()) {
+ sparePartRequisitionDetail.setSpareRequisitionId(eamSparePartRequisition.getId());
+ eamSparePartRequisitionDetailService.saveOrUpdate(sparePartRequisitionDetail);
+ }
+
return Result.OK("缂栬緫鎴愬姛!");
}
@@ -107,6 +130,11 @@
@ApiOperation(value = "澶囦欢璇疯喘鍗�-閫氳繃id鍒犻櫎", notes = "澶囦欢璇疯喘鍗�-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ List<EamSparePartRequisitionDetail> details = eamSparePartRequisitionDetailService.lambdaQuery()
+ .eq(EamSparePartRequisitionDetail::getSpareRequisitionId, id).list();
+ for (EamSparePartRequisitionDetail detail : details) {
+ eamSparePartRequisitionDetailService.removeById(detail.getId());
+ }
eamSparePartRequisitionService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
--
Gitblit v1.9.3