From 3e0f519c396ac8a72e7bbd426e4f38fa6cc403dc Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 14 三月 2025 16:50:34 +0800
Subject: [PATCH] 点检模块
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintOrderController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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..b633ce4 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,6 +1,10 @@
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;
@@ -54,7 +58,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,9 +71,14 @@
}
String[] split = maintCode.split("_");
bo.setEquId(Long.valueOf(split[0]));
- bo.setPlanTime(DateUtils.parseDate(split[1]));
bo.setMaintCode(null);
-// return eimsMaintOrderService.queryPageList(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);
+
return eimsMaintOrderService.queryPageListCustom(bo, pageQuery);
}
--
Gitblit v1.9.3