From e04a3cfe29914cc7418504e78701dd512fed0d3a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 27 四月 2026 11:50:00 +0800
Subject: [PATCH] feat: 计划时间格式调整为年月日+时分秒;多选报工人;生产报工只能看指定报告人
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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 9a58b22..4f6fe9e 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -584,8 +584,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());
+ workOrder.setPlanEndTime(LocalDateTime.now());
List<ProductWorkOrderDto> productWorkOrders = productWorkOrderMapper
.pageProductWorkOrder(new Page<>(1, -1), workOrder).getRecords();
long sum = productWorkOrders.stream()
@@ -1589,30 +1589,31 @@
@Override
public List<MapDto> processOutputAnalysis(Integer type) {
- LocalDate today = LocalDate.now();
- LocalDate startDate;
- LocalDate endDate = today;
+ // 鑾峰彇褰撳墠鏃堕棿鐐�
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime startDateTime;
+ LocalDateTime endDateTime = now.with(LocalTime.MAX);
switch (type) {
case 1: // 鍛�
- startDate = today.with(DayOfWeek.MONDAY);
+ startDateTime = now.with(DayOfWeek.MONDAY).with(LocalTime.MIN);
break;
case 2: // 鏈�
- startDate = today.withDayOfMonth(1);
+ startDateTime = now.withDayOfMonth(1).with(LocalTime.MIN);
break;
case 3: // 瀛ｅ害
- int currentMonth = today.getMonthValue();
+ int currentMonth = now.getMonthValue();
int startMonth = ((currentMonth - 1) / 3) * 3 + 1;
- startDate = LocalDate.of(today.getYear(), startMonth, 1);
+ startDateTime = LocalDateTime.of(now.getYear(), startMonth, 1, 0, 0, 0);
break;
default:
- startDate = today.with(DayOfWeek.MONDAY);
+ startDateTime = now.with(DayOfWeek.MONDAY).with(LocalTime.MIN);
break;
}
ProductWorkOrderDto queryDto = new ProductWorkOrderDto();
- queryDto.setPlanStartTime(startDate);
- queryDto.setPlanEndTime(endDate);
+ queryDto.setPlanStartTime(startDateTime);
+ queryDto.setPlanEndTime(endDateTime);
List<ProductWorkOrderDto> list = productWorkOrderMapper.pageProductWorkOrder(new Page<>(1, -1), queryDto)
.getRecords();
@@ -1632,7 +1633,7 @@
BigDecimal total = processOutputMap.values().stream()
.reduce(BigDecimal.ZERO, BigDecimal::add);
- if (BigDecimal.ZERO.compareTo(total) == 0) {
+ if (total.compareTo(BigDecimal.ZERO) == 0) {
return new ArrayList<>();
}
--
Gitblit v1.9.3