From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 5d1254d..6401da6 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
@@ -12,6 +12,7 @@
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.core.annotation.AnnotationConfigurationException;
import javax.servlet.http.HttpServletResponse;
@@ -514,11 +515,11 @@
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,5));
Row header1 = sheet.createRow(1);
header1.setHeight((short) 500);
- header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
+ 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(4).setCellValue("鍦ㄤ繚/鎶曚繚浜烘暟");
header1.createCell(5).setCellValue("鎬昏垂鐢紙鍏冿級");
for (int i = 0; i < 6; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
@@ -528,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));
@@ -783,7 +784,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
+ header1.createCell(0).setCellValue(cellValue);
header1.createCell(1).setCellValue("");
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濆崟鍙�");
@@ -1056,7 +1057,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
+ header1.createCell(0).setCellValue(cellValue);
header1.createCell(1).setCellValue("");
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濆崟鍙�");
@@ -1342,7 +1343,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));
@@ -1353,7 +1354,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));
--
Gitblit v1.9.3