From 5bc0e587dc5dd7ca40f4285eed966429e69535e7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 十二月 2024 10:54:49 +0800
Subject: [PATCH] 检验任务添加一个撤销的功能(如果已经提交的撤销)
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 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..3792a83 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 {
@@ -194,6 +194,20 @@
LocalDateTime oldStart = start;
LocalDateTime oldEnd = end;
Map<String, Object> map = new HashMap<>();
+ switch (type) {
+ case "鍛�":
+ oldStart = start.minusDays(7);
+ oldEnd = end.minusDays(7);
+ break;
+ case "鏈�":
+ oldStart = start.minusMonths(1);
+ oldEnd = end.minusMonths(1);
+ break;
+ case "骞�":
+ oldStart = start.minusYears(1);
+ oldEnd = end.minusYears(1);
+ break;
+ }
/*椤圭洰鎺ユ敹*/
//浠婃棩椤圭洰鎺ユ敹閲�
Long receive = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
@@ -270,11 +284,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 +414,6 @@
.collect(Collectors.groupingBy(
t -> userMapper.selectById(t.getCheck()).getName(),
Collectors.summingDouble(AuxiliaryOutputWorkingHours::getOutputWorkTime)));
-
return mapMap;
}
}
--
Gitblit v1.9.3