From b278d488be1d5e626eecdcfc2201b97dc85937cf Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 30 四月 2025 14:48:40 +0800
Subject: [PATCH] 表格生成调整
---
src/main/java/com/whyc/service/ExcelService.java | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelService.java b/src/main/java/com/whyc/service/ExcelService.java
index 9d16272..e7bd6ec 100644
--- a/src/main/java/com/whyc/service/ExcelService.java
+++ b/src/main/java/com/whyc/service/ExcelService.java
@@ -26,6 +26,7 @@
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Service
public class ExcelService {
@@ -429,7 +430,10 @@
//濉厖鏁版嵁鍒�,key鏄垪鏃ユ湡. value鏄垪鏁版嵁
AtomicInteger count = new AtomicInteger();
- dataListMap.forEach((key, value) -> {
+ //瀵筪ateKeySet鎸夋椂闂存帓搴�
+ Stream<Date> dateKeySetSorted = dateKeySet.stream().sorted(Comparator.comparing(Date::getTime));
+ dateKeySetSorted.forEach(key -> {
+ List<BattRealTimeDataHistory> value = dataListMap.get(key);
//绗笁琛屾椂闂村垪濉厖
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd\nHH:mm:ss");
row2OfSheet4.createCell(count.get() + 1).setCellValue(format.format(key));
@@ -443,29 +447,6 @@
for (int j = 1; j <= 108; j++) { //杩欎釜鏄鐨勯亶鍘�
sheet4.getRow(j + 2).createCell(columnCount-1);
}
-
- /*for (int i = 0; i < columnCount; i++) { //杩欎釜鏄垪鐨勯亶鍘�
- if (i == columnCount - 1) {
- //鏈�鍚庝竴鍒楀娉�:鍏ㄩ儴濉┖
- row2OfSheet4.createCell(i + 1);
- for (int j = 1; j <= 108; j++) { //杩欎釜鏄鐨勯亶鍘�
- sheet4.getRow(j + 2).createCell(i );
- }
- } else {
- //鑾峰彇鏁版嵁
- List<BattRealTimeDataHistory> list = battRTDataHisService.getFirstRecordListOfDay(tableListInDB.get(i), timeAgo);
- list.sort(Comparator.comparing(BattRealTimeDataHistory::getMonNum));
- //绗笁琛岀殑鏃堕棿鍒楀～鍏�
- Date testStartTime = list.get(0).getTestStartTime();
- //鑾峰彇骞存湀
- String testMonth = DateUtil.YYYY_DOT_MM.format(testStartTime);
- row2OfSheet4.createCell(i + 1).setCellValue(testMonth);
- addStatistics(list, "vol", "res");
- for (int j = 1; j <= 108; j++) { //杩欎釜鏄鐨勯亶鍘�
- sheet4.getRow(j + 2).createCell(i + 1).setCellValue((list.get(j - 1).getMonVol()));
- }
- }
- }*/
addGlobalStylesToAllCells(sheet4, workbook);
--
Gitblit v1.9.1