From 959aaa9283687db769adb58000953996030e5e43 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 六月 2024 08:52:01 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 6401da6..99f5f1e 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
@@ -1190,24 +1190,27 @@
}
Row header1 = sheet.createRow(1);
header1.createCell(0).setCellValue("鎶曚繚浜�");
- header1.createCell(1).setCellValue("琚繚闄╀汉");
- header1.createCell(2).setCellValue("");
- header1.createCell(3).setCellValue("淇濋櫓鏂规");
- header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
- header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
+ header1.createCell(1).setCellValue("");
+ header1.createCell(2).setCellValue("琚繚闄╀汉");
+ header1.createCell(3).setCellValue("");
+ header1.createCell(4).setCellValue("淇濋櫓鏂规");
+ header1.createCell(5).setCellValue("鐢宠鎻愪氦鏃ユ湡");
+// header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
for (int i = 0; i < 6; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,1,2));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,2,3));
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(insuranceApply.getShopName());
- header2.createCell(1).setCellValue(insuranceApply.getCompanyName());
- header2.createCell(2).setCellValue(insuranceApply.getInsureNum());
- header2.createCell(3).setCellValue(insuranceApply.getSolutionsName());
- header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(insuranceApply.getStartTime()));
- header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(insuranceApply.getEndTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,1,2));
+ header2.createCell(1).setCellValue("");
+ header2.createCell(2).setCellValue(insuranceApply.getCompanyName());
+ header2.createCell(3).setCellValue("");
+ header2.createCell(4).setCellValue(insuranceApply.getSolutionsName());
+ header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(insuranceApply.getCreateDate()));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,2,3));
for (int i = 0; i < 6; i++) {
configDataCell(sxssfWorkbook,header2.getCell(i));
}
--
Gitblit v1.9.3