From 2e9962fe2881c92a0953dff2ad475cb40365c10f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 17 十二月 2024 17:31:22 +0800
Subject: [PATCH] 统计工时调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
index fe35e81..17c7cf0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
@@ -169,10 +169,10 @@
}
receTenDays.add(insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
.eq(InsOrder::getState, 1)
- .between(InsOrder::getCreateTime, startDate.atStartOfDay(), startDate.atTime(23, 59, 59))));
+ .between(InsOrder::getCreateTime, startDate.atStartOfDay(), startDate.plusMonths(1).minusDays(1).atTime(23, 59, 59))));
finTenDays.add(insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
.eq(InsOrder::getState, 4)
- .between(InsOrder::getCreateTime, startDate.atStartOfDay(), startDate.atTime(23, 59, 59))));
+ .between(InsOrder::getCreateTime, startDate.atStartOfDay(), startDate.plusMonths(1).minusDays(1).atTime(23, 59, 59))));
if (type.equals("骞�")) {
startDate = startDate.plusMonths(1);
}else {
@@ -270,11 +270,11 @@
}
receTenDays.add(insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getState, 1)
- .between(InsProduct::getCreateTime, startDate.atStartOfDay(), startDate.atTime(23, 59, 59))));
+ .between(InsProduct::getCreateTime, startDate.atStartOfDay(), startDate.plusMonths(1).minusDays(1).atTime(23, 59, 59))));
finTenDays.add(insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getState, 1)
.isNotNull(InsProduct::getInsResult)
- .between(InsProduct::getCreateTime, startDate.atStartOfDay(), startDate.atTime(23, 59, 59))));
+ .between(InsProduct::getCreateTime, startDate.atStartOfDay(), startDate.plusMonths(1).minusDays(1).atTime(23, 59, 59))));
if (type.equals("骞�")) {
startDate = startDate.plusMonths(1);
}else {
@@ -400,7 +400,6 @@
.collect(Collectors.groupingBy(
t -> userMapper.selectById(t.getCheck()).getName(),
Collectors.summingDouble(AuxiliaryOutputWorkingHours::getOutputWorkTime)));
-
return mapMap;
}
}
--
Gitblit v1.9.3