From 2f0009c750de4d47a18cce4a5a403fa83ba0c209 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 02 七月 2025 08:58:27 +0800
Subject: [PATCH] feat(report): 新增设备稼动率统计功能
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java
index cddc0b9..088cf34 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java
@@ -6,6 +6,10 @@
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.eims.domain.bo.EimsEquBo;
+import org.dromara.eims.domain.vo.EimsEquVo;
+import org.dromara.eims.service.IEimsEquService;
+import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -35,11 +39,12 @@
public class EimsInventoryDetailController extends BaseController {
private final IEimsInventoryDetailService eimsInventoryDetailService;
+ private final IEimsEquService equService;
/**
* 鏌ヨ鐩樼偣鏄庣粏鍒楄〃
*/
- @SaCheckPermission("eims:inventoryDetail:list")
+ @SaCheckPermission("eims:inventory:list")
@GetMapping("/list")
public TableDataInfo<EimsInventoryDetailVo> list(EimsInventoryDetailBo bo, PageQuery pageQuery) {
//return eimsInventoryDetailService.queryPageList(bo, pageQuery);
@@ -49,7 +54,7 @@
/**
* 瀵煎嚭鐩樼偣鏄庣粏鍒楄〃
*/
- @SaCheckPermission("eims:inventoryDetail:export")
+ @SaCheckPermission("eims:inventory:export")
@Log(title = "鐩樼偣鏄庣粏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(EimsInventoryDetailBo bo, HttpServletResponse response) {
@@ -62,7 +67,7 @@
*
* @param id 涓婚敭
*/
- @SaCheckPermission("eims:inventoryDetail:query")
+ @SaCheckPermission("eims:inventory:query")
@GetMapping("/{id}")
public R<EimsInventoryDetailVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long id) {
@@ -72,7 +77,7 @@
/**
* 鏂板鐩樼偣鏄庣粏
*/
- @SaCheckPermission("eims:inventoryDetail:add")
+ @SaCheckPermission("eims:inventory:add")
@Log(title = "鐩樼偣鏄庣粏", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -83,11 +88,19 @@
/**
* 淇敼鐩樼偣鏄庣粏
*/
- @SaCheckPermission("eims:inventoryDetail:edit")
+ @SaCheckPermission("eims:inventory:edit")
@Log(title = "鐩樼偣鏄庣粏", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody EimsInventoryDetailBo bo) {
+ //TODO 楠岃瘉-棣栨鐩樼偣锛岄渶瑕佷慨鏀硅澶囧鍏ョ姸鎬� 鏂板鍏�->宸茬‘璁�
+ if(bo.getStatus().equals("1")){ //宸茬洏
+ EimsEquVo eimsEquVo = equService.queryById(bo.getEquId());
+ EimsEquBo eimsEquBo = new EimsEquBo();
+ eimsEquVo.setImportStatus("1"); // 璁剧疆涓� 宸茬‘璁�
+ BeanUtils.copyProperties(eimsEquVo,eimsEquBo);
+ equService.updateByBo(eimsEquBo);
+ }
return toAjax(eimsInventoryDetailService.updateByBo(bo));
}
@@ -96,7 +109,7 @@
*
* @param ids 涓婚敭涓�
*/
- @SaCheckPermission("eims:inventoryDetail:remove")
+ @SaCheckPermission("eims:inventory:remove")
@Log(title = "鐩樼偣鏄庣粏", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
--
Gitblit v1.9.3