From 44a0ef1620cad87479390900eb6ded041c7b8d7b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 17 五月 2024 16:56:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 a78ff84..5d1254d 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
@@ -811,7 +811,7 @@
header2.createCell(5).setCellValue("");
header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(7).setCellValue("");
- header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
+ header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
header2.createCell(9).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
header2.createCell(10).setCellValue(data.getAddNum());
header2.createCell(11).setCellValue(data.getDelNum());
@@ -1255,7 +1255,7 @@
sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,0,5));
Row header7= sheet.createRow(rowIndex+1);
header7.setHeight((short) 3000);
- header7.createCell(0).setCellValue("鎶曚繚浼佷笟绛剧珷 锛� \n \n \n" +"鏃ユ湡锛� 骞� 鏈� 鏃� ");
+ header7.createCell(0).setCellValue("琚繚闄╀汉绛剧珷 锛� \n \n \n" +"鏃ユ湡锛� 骞� 鏈� 鏃� ");
for (int i =0; i < 6; i++) {
if(i>0){
header7.createCell(i).setCellValue("");
@@ -1650,9 +1650,10 @@
configFirstCell(sxssfWorkbook,header3.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,8));
- Integer row = 4;
+ Integer row = 3;
List<ApplyChagneDetail> addChangeDetailList = data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(addChangeDetailList)){
+ row = row + 1;
Row header4 = sheet.createRow(row);
header4.createCell(0).setCellValue("鍔犱繚浜哄憳");
for (int i = 0; i < 8; i++) {
@@ -1722,7 +1723,6 @@
row = row + 1 ;
for (int rowIndex = 0; rowIndex < reduceChangeDetailList.size(); rowIndex++) {
- row = row + rowIndex;
Row header6 = sheet.createRow(row);
ApplyChagneDetail applyChagneDetail = reduceChangeDetailList.get(rowIndex);
header6.createCell(0).setCellValue(rowIndex + 1);
@@ -1738,6 +1738,7 @@
configDataCell(sxssfWorkbook,header6.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
+ row = row + 1;
}
}
@@ -1776,7 +1777,7 @@
byte [] bookByteAry = out.toByteArray();
InputStream in = new ByteArrayInputStream(bookByteAry);
String tempExcel = saveIsToFile(in);
- String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
+ String tempPdf = System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf"; //"d:/1.docx";
// ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
File f = new File(tempPdf);
--
Gitblit v1.9.3