From 4c6168cf60426dc1e9c95d575c5efc66bf8d9af9 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 03 六月 2026 18:08:57 +0800
Subject: [PATCH] 生产报工更新实际开始时间和结束时间
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 188f70e..fbd1e65 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -588,8 +588,8 @@
public ProductionTurnoverDto workInProcessTurnover() {
ProductionTurnoverDto productionTurnoverDto = new ProductionTurnoverDto();
ProductWorkOrderDto workOrder = new ProductWorkOrderDto();
- workOrder.setPlanStartTime(LocalDate.now().minusMonths(1));
- workOrder.setPlanEndTime(LocalDate.now());
+ workOrder.setPlanStartTime(LocalDateTime.now().minusMonths(1));
+ workOrder.setPlanEndTime(LocalDateTime.now());
List<ProductWorkOrderDto> productWorkOrders = productWorkOrderMapper
.pageProductWorkOrder(new Page<>(1, -1), workOrder).getRecords();
long sum = productWorkOrders.stream()
@@ -1594,23 +1594,23 @@
@Override
public List<MapDto> processOutputAnalysis(Integer type) {
LocalDate today = LocalDate.now();
- LocalDate startDate;
- LocalDate endDate = today;
+ LocalDateTime startDate;
+ LocalDateTime endDate = today.atTime(23, 59, 59);
switch (type) {
case 1: // 鍛�
- startDate = today.with(DayOfWeek.MONDAY);
+ startDate = today.with(DayOfWeek.MONDAY).atStartOfDay();
break;
case 2: // 鏈�
- startDate = today.withDayOfMonth(1);
+ startDate = today.withDayOfMonth(1).atStartOfDay();
break;
case 3: // 瀛ｅ害
int currentMonth = today.getMonthValue();
int startMonth = ((currentMonth - 1) / 3) * 3 + 1;
- startDate = LocalDate.of(today.getYear(), startMonth, 1);
+ startDate = LocalDate.of(today.getYear(), startMonth, 1).atStartOfDay();
break;
default:
- startDate = today.with(DayOfWeek.MONDAY);
+ startDate = today.with(DayOfWeek.MONDAY).atStartOfDay();
break;
}
--
Gitblit v1.9.3