From 54bbda6f374f3b8ebafed04d49f756fd75e53a1a Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期六, 06 四月 2024 12:31:39 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
index a371437..c9269d2 100644
--- a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
+++ b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -1006,17 +1006,17 @@
try {
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 9; i++) {
sheet.setColumnWidth(i, ((i==3|| i== 4|| i== 5 ||i== 6 || i==7)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
- sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,8));
Row title = sheet.createRow(0);
title.setHeight((short) 2000);
Cell c = title.createCell(0);
c.setCellValue(sheetName);
configFirstCell(sxssfWorkbook,c);
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 9; i++) {
if(i>0){
title.createCell(i).setCellValue("");
}
@@ -1549,14 +1549,14 @@
try {
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
- for (int i = 0; i < 12; i++) {
- sheet.setColumnWidth(i, ((i==3|| i==4|| i== 5 || i==9||i==10|| i==11)?16:8) * 2 * 256);
+ for (int i = 0; i < 8; i++) {
+ sheet.setColumnWidth(i, ((i==0|| i==1|| i== 3|| i== 4|| i== 7)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
- sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,11));
+ sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,7));
Row title = sheet.createRow(0);
title.setHeight((short) 2000);
- for (int i = 0; i < 12; i++) {
+ for (int i = 0; i < 8; i++) {
title.createCell(i).setCellValue(i==0?sheetName:"");
configTitleCell(sxssfWorkbook,title.getCell(i));
}
@@ -1681,7 +1681,7 @@
header6.createCell(6).setCellValue("");
header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
for (int i = 0; i < 8; i++) {
- configFirstCell(sxssfWorkbook,header6.getCell(i));
+ configDataCell(sxssfWorkbook,header6.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
}
@@ -1703,7 +1703,7 @@
configInfoCell(sxssfWorkbook,header6.getCell(i),HorizontalAlignment.LEFT);
}
header6.setHeight((short) 2000);
- sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,0,11));
+ sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,0,7));
Row header7= sheet.createRow(rowIndex+1);
header7.setHeight((short) 3000);
header7.createCell(0).setCellValue("鎶曚繚浜虹绔� 锛� \n \n \n" +"鏃ユ湡锛� 骞� 鏈� 鏃� ");
@@ -1713,7 +1713,7 @@
}
configInfoCell(sxssfWorkbook,header7.getCell(i),HorizontalAlignment.RIGHT);
}
- sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,11));
+ sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,7));
//涓存椂缂撳啿鍖�
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -1798,7 +1798,7 @@
header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(5).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList()).size());
header2.createCell(6).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList()).size());
- header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
+ header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
for (int i = 0; i < 8; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
}
@@ -1812,8 +1812,9 @@
header3.createCell(5).setCellValue("");
header3.createCell(6).setCellValue("");
header3.createCell(7).setCellValue("");
- for (int i = 0; i < 8; i++) {
- configFirstCell(sxssfWorkbook,header3.getCell(i));
+ configFirstCell(sxssfWorkbook,header3.getCell(0));
+ for (int i = 1; i < 8; i++) {
+ configDataCell(sxssfWorkbook,header3.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,7));
@@ -1853,7 +1854,7 @@
header6.createCell(6).setCellValue("");
header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
for (int i = 0; i < 8; i++) {
- configFirstCell(sxssfWorkbook,header6.getCell(i));
+ configDataCell(sxssfWorkbook,header6.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
}
--
Gitblit v1.9.3