From 66e943c91e133eec5a0822ea22fd92cbc04bc9f3 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 12 三月 2025 16:04:14 +0800
Subject: [PATCH] 保养工单汇总
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintOrderController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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 5610c22..4eeba76 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
@@ -2,10 +2,14 @@
import java.util.List;
+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.utils.DateUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.eims.domain.vo.MaintOrdeGroupVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -46,6 +50,30 @@
return eimsMaintOrderService.queryPageListCustom(bo, pageQuery);
}
+
+ @SaCheckPermission("eims:maintOrder:list")
+ @GetMapping("/groupList")
+ public TableDataInfo<MaintOrdeGroupVo> group(EimsMaintOrderBo bo, PageQuery pageQuery) {
+// return eimsMaintOrderService.queryPageList(bo, pageQuery);
+ return eimsMaintOrderService.queryPageGroupList(bo, pageQuery);
+ }
+
+ @SaCheckPermission("eims:maintOrder:list")
+ @GetMapping("/detailList")
+ public TableDataInfo<EimsMaintOrderVo> groupDetail(EimsMaintOrderBo bo, PageQuery pageQuery) {
+ // 杩欓噷浣跨敤mintCode浼犻�掍簡 equid + plantime
+ String maintCode = bo.getMaintCode();
+ if (StringUtils.isEmpty(maintCode) || !maintCode.contains("_")) {
+ return TableDataInfo.build(new Page<>(0,0));
+ }
+ 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);
+ }
+
/**
* 瀵煎嚭淇濆吇宸ュ崟鍒楄〃
*/
@@ -65,7 +93,7 @@
@SaCheckPermission("eims:maintOrder:query")
@GetMapping("/{id}")
public R<EimsMaintOrderVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long id) {
+ @PathVariable Long id) {
return R.ok(eimsMaintOrderService.queryById(id));
}
--
Gitblit v1.9.3