From 0a27a9c0f9e1213dff16162d73a03dba0473b96e Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 27 六月 2025 11:06:36 +0800
Subject: [PATCH] refactor(lb-eims):优化维护计划生成订单功能
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintOrderController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 4eeba76..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
@@ -1,14 +1,20 @@
package org.dromara.eims.controller;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.TemporalAdjusters;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
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;
@@ -54,7 +60,6 @@
@SaCheckPermission("eims:maintOrder:list")
@GetMapping("/groupList")
public TableDataInfo<MaintOrdeGroupVo> group(EimsMaintOrderBo bo, PageQuery pageQuery) {
-// return eimsMaintOrderService.queryPageList(bo, pageQuery);
return eimsMaintOrderService.queryPageGroupList(bo, pageQuery);
}
@@ -68,10 +73,22 @@
}
String[] split = maintCode.split("_");
bo.setEquId(Long.valueOf(split[0]));
- bo.setPlanTime(DateUtils.parseDate(split[1]));
bo.setMaintCode(null);
-// return eimsMaintOrderService.queryPageList(bo, pageQuery);
- return eimsMaintOrderService.queryPageListCustom(bo, pageQuery);
+ LocalDate planTime = DateUtils.parseDate(split[1]).toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate startOfMonth = planTime.with(TemporalAdjusters.firstDayOfMonth());
+ LocalDate endOfMonth = planTime.with(TemporalAdjusters.lastDayOfMonth());
+ Map<String, Object> params = bo.getParams();
+ params.put("beginPlanTime",startOfMonth);
+ params.put("endPlanTime",endOfMonth);
+
+ 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;
}
/**
@@ -119,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