From d88bc5788b7097027bad6950fe039acb231862fd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 18 六月 2024 10:23:46 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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..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
@@ -519,7 +519,7 @@
             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));
@@ -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));
@@ -1343,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));
@@ -1354,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