From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 82fe3a8..910e29f 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
@@ -16,10 +16,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -217,16 +214,16 @@
/*鑾峰彇鍚庝竴鍛ㄦ棩鏈�*/
LocalDate currentDate = LocalDate.now();
List<LocalDate> weekDays = new ArrayList<>();
- for (int i = 6; i >= 0; i--) {
+ for (int i = 6, j = 0; i >= 0; i--, j++) {
weekDays.add(currentDate.minusDays(i));
//鏌ヨ褰撳ぉ闇�瑕佹娴嬬殑濮旀墭璁㈠崟
List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery()
.eq(InsOrder::getState, 1)
.in(InsOrder::getInsState, insState)
- .apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY"));
+ .apply("DATE(create_time) = CURDATE() - INTERVAL " + j + " DAY"));
List<Map<String, Object>> works = insOrders.stream().map(insOrder -> {
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("text", "濮旀墭璁㈠崟" + insOrder.getEntrustCode() + "妫�娴�");
+ hashMap.put("text", insOrder.getEntrustCode());
hashMap.put("type", insOrder.getType());
User user = userMapper.selectById(insOrder.getCreateUser());
hashMap.put("name", user.getName());
--
Gitblit v1.9.3