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/EimsMaintOrderController.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintOrderController.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintOrderController.java index b633ce4..fe4f775 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintOrderController.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintOrderController.java @@ -11,8 +11,10 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.common.core.constant.DictConstants; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StringUtils; +import org.dromara.eims.domain.bo.MaintOrderBo; import org.dromara.eims.domain.vo.MaintOrdeGroupVo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -79,7 +81,14 @@ params.put("beginPlanTime",startOfMonth); params.put("endPlanTime",endOfMonth); - return eimsMaintOrderService.queryPageListCustom(bo, pageQuery); + TableDataInfo<EimsMaintOrderVo> tableDataInfo = eimsMaintOrderService.queryPageListCustom(bo, pageQuery); + tableDataInfo.getRows().forEach(e -> { + // 濡傛灉淇濆吇鏂规硶鏄淮淇紝鏌ヨ鍏宠仈鐨勫浠� + if (DictConstants.MAINT_METHOD_DETAIL.REPAIR.equals(e.getMaintFun())) { + e.setSpareParts(eimsMaintOrderService.querySpareParts(e.getMaintCode())); + } + }); + return tableDataInfo; } /** @@ -127,6 +136,14 @@ return toAjax(eimsMaintOrderService.updateByBo(bo)); } + @SaCheckPermission("eims:maintOrder:edit") + @Log(title = "淇濆吇宸ュ崟-鎵归噺淇敼", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("editBatch") + public R<Void> editBatch(@Validated(EditGroup.class) @RequestBody MaintOrderBo bo) { + return toAjax(eimsMaintOrderService.updateBatchByBo(bo)); + } + /** * 鍒犻櫎淇濆吇宸ュ崟 * -- Gitblit v1.9.3