From d37bf55e27b7edb61037bccde6cabeda1ddec6b7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 30 七月 2024 15:54:22 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 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 6707ec4..fe18711 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
@@ -517,9 +517,9 @@
header1.setHeight((short) 500);
header1.createCell(0).setCellValue(Constants.equalsInteger(data.getSolutionType(), Constants.ZERO)?"鎶曚繚浼佷笟":"琚繚闄╀汉");
header1.createCell(1).setCellValue("淇濋櫓鏂规");
- header1.createCell(2).setCellValue("淇濋櫓鐢熸晥璧锋湡");
- header1.createCell(3).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
- header1.createCell(4).setCellValue("鎶曚繚浜烘暟");
+ header1.createCell(2).setCellValue(Constants.getApplyTimeTitle(1,data));
+ header1.createCell(3).setCellValue(Constants.getApplyTimeTitle(0,data));
+ header1.createCell(4).setCellValue("鍦ㄤ繚/鎶曚繚浜烘暟");
header1.createCell(5).setCellValue("鎬昏垂鐢紙鍏冿級");
for (int i = 0; i < 6; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
@@ -529,7 +529,7 @@
header2.createCell(1).setCellValue(data.getSolutionsName());
header2.createCell(2).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
header2.createCell(3).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
- header2.createCell(4).setCellValue(data.getInsureNum());
+ header2.createCell(4).setCellValue(data.getGuaranteeNum()+" / "+data.getInsureNum());
header2.createCell(5).setCellValue(Constants.formatBigdecimal2Float(data.getFee()).toString());
for (int i = 0; i < 6; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
@@ -650,8 +650,8 @@
header1.createCell(5).setCellValue("");
header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(7).setCellValue("");
- header1.createCell(8).setCellValue("鏈熸湜鎵瑰鐢熸晥鏃ユ湡");
- header1.createCell(9).setCellValue("鏈熸湜鎵瑰噺鐢熸晥鏃ユ湡");
+ header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(1,data));
+ header1.createCell(9).setCellValue(Constants.getChangeApplyTimeTitle(0,data));
header1.createCell(10).setCellValue("鍔犱繚浜烘暟");
header1.createCell(11).setCellValue("鍑忎繚浜烘暟");
for (int i = 0; i < 12; i++) {
@@ -967,7 +967,7 @@
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(6).setCellValue("鎹㈠巶浜烘暟");
- header1.createCell(7).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+ header1.createCell(7).setCellValue(Constants.getChangeApplyTimeTitle(2,data));
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
@@ -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));
}
@@ -1343,7 +1346,7 @@
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
- header1.createCell(5).setCellValue("鎶曚繚浜烘暟");
+ header1.createCell(5).setCellValue("鍦ㄤ繚/鎶曚繚浜烘暟");
header1.createCell(6).setCellValue("鎬昏垂鐢紙鍏冿級");
for (int i = 0; i < 7; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
@@ -1354,7 +1357,7 @@
header2.createCell(2).setCellValue(data.getSolutionName());
header2.createCell(3).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
- header2.createCell(5).setCellValue(data.getInsureNum());
+ header2.createCell(5).setCellValue(data.getGuaranteeNum()+" / "+data.getInsureNum());
header2.createCell(6).setCellValue(Constants.formatBigdecimal2Float(data.getFee()).toString());
for (int i = 0; i < 7; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
@@ -1841,8 +1844,8 @@
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(5).setCellValue("鍔犱繚浜烘暟");
header1.createCell(6).setCellValue("鍑忎繚浜烘暟");
- header1.createCell(7).setCellValue("鎵瑰鐢熸晥鏃ユ湡");
- header1.createCell(8).setCellValue("鎵瑰噺鐢熸晥鏃ユ湡");
+ header1.createCell(7).setCellValue(Constants.getChangeApplyTimeTitle(1,data));
+ header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(0,data));
for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
@@ -2011,7 +2014,7 @@
header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(7).setCellValue("鎹㈠巶浜烘暟");
- header1.createCell(8).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+ header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(2,data));
sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
sheet.addMergedRegion(new CellRangeAddress(1 ,1,2,3));
--
Gitblit v1.9.3