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 | 593 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 332 insertions(+), 261 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 a371437..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));
@@ -536,10 +537,11 @@
Row header4 = sheet.createRow(3);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("澶囨敞");
header4.setHeight((short) 500);
for (int i = 0; i < 6; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
@@ -552,10 +554,11 @@
// header5.setHeight((short) 300);
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(d.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(d.getDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(d.getDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(d.getRemark(),""));
// 璁剧疆鏁版嵁鍗曞厓鏍�
for (int i = 0; i < 6; i++) {
configDataCell(sxssfWorkbook, header5.getCell(i));
@@ -626,7 +629,7 @@
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
for (int i = 0; i < 12; i++) {
- sheet.setColumnWidth(i, ((i==3|| i== 5 || i==9|| i==11)?16:8) * 2 * 256);
+ sheet.setColumnWidth(i, ((i==2|| i== 3 || i==8|| i==9|| i==10)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,11));
@@ -640,34 +643,47 @@
}
Row header1 = sheet.createRow(1);
header1.createCell(0).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(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
- header1.createCell(9).setCellValue("鍔犱繚浜烘暟");
- header1.createCell(10).setCellValue("鍑忎繚浜烘暟");
- header1.createCell(11).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+ header1.createCell(7).setCellValue("");
+ header1.createCell(8).setCellValue("鏈熸湜鎵瑰鐢熸晥鏃ユ湡");
+ header1.createCell(9).setCellValue("鏈熸湜鎵瑰噺鐢熸晥鏃ユ湡");
+ header1.createCell(10).setCellValue("鍔犱繚浜烘暟");
+ header1.createCell(11).setCellValue("鍑忎繚浜烘暟");
for (int i = 0; i < 12; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,2));
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,6,8));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,6,7));
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(data.getCompanyName());
- header2.createCell(3).setCellValue(data.getSolutionsName());
- header2.createCell(4).setCellValue(data.getApplyCode());
- header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+ header2.createCell(1).setCellValue("");
+ header2.createCell(2).setCellValue(data.getSolutionsName());
+ header2.createCell(3).setCellValue(data.getApplyCode());
+ header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+ header2.createCell(5).setCellValue("");
header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
- header2.createCell(9).setCellValue(data.getAddNum());
- header2.createCell(10).setCellValue(data.getDelNum());
- header2.createCell(11).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,2));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,6,8));
+ header2.createCell(7).setCellValue("");
+ header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
+ header2.createCell(9).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
+ header2.createCell(10).setCellValue(data.getAddNum());
+ header2.createCell(11).setCellValue(data.getDelNum());
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,6,7));
for (int i = 0; i < 12; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
}
Row header3 = sheet.createRow(3);
+ for (int i = 0; i < 12; i++) {
+ header3.createCell(i).setCellValue("");
+ }
header3.createCell(0).setCellValue("鍔犱繚浜哄憳");
header3.createCell(6).setCellValue("鍑忎繚浜哄憳");
sheet.addMergedRegion(new CellRangeAddress(3 ,3,0,5));
@@ -678,16 +694,18 @@
Row header4 = sheet.createRow(4);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("澶囨敞");
header4.createCell(6).setCellValue("搴忓彿");
header4.createCell(7).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(8).setCellValue("鎬у埆");
- header4.createCell(9).setCellValue("韬唤璇佸彿");
- header4.createCell(10).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(11).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(8).setCellValue("鎬у埆");
+ header4.createCell(8).setCellValue("韬唤璇佸彿");
+ header4.createCell(9).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(10).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(11).setCellValue("澶囨敞");
for (int i = 0; i < 12; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
}
@@ -700,10 +718,11 @@
if(addModel!=null){
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
}else{
for (int i = 0; i < 6; i++) {
header5.createCell(i).setCellValue("");
@@ -712,10 +731,11 @@
if(delModel!=null){
header5.createCell(6).setCellValue(rowIndex+1);
header5.createCell(7).setCellValue(StringUtils.defaultString(delModel.getMemberName(),""));
- header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
- header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
- header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
- header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+// header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(8).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
+ header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
+ header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+ header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getRemark(),""));
}else{
for (int i =6; i < 12; i++) {
header5.createCell(i).setCellValue("");
@@ -751,46 +771,54 @@
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
for (int i = 0; i < 12; i++) {
- sheet.setColumnWidth(i, ((i==3|| i==4|| i== 5 || i==9||i==10|| i==11)?16:8) * 2 * 256);
+ sheet.setColumnWidth(i, ((i==2|| i== 3 || i==8|| i==9|| i==10)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,11));
Row title = sheet.createRow(0);
- title.setHeight((short) 2000);
+ title.setHeight((short) 800);
+ Cell c = title.createCell(0);
+ c.setCellValue(sheetName);
for (int i = 0; i < 12; i++) {
- title.createCell(i).setCellValue(i==0?sheetName:"");
+// title.createCell(i).setCellValue(i==0?sheetName:"");
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
header1.createCell(0).setCellValue(cellValue);
- 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(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
- header1.createCell(9).setCellValue("鍔犱繚浜烘暟");
- header1.createCell(10).setCellValue("鍑忎繚浜烘暟");
- header1.createCell(11).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+ header1.createCell(7).setCellValue("");
+ header1.createCell(8).setCellValue("鏈熸湜鎵瑰鐢熸晥鏃ユ湡");
+ header1.createCell(9).setCellValue("鏈熸湜鎵瑰噺鐢熸晥鏃ユ湡");
+ header1.createCell(10).setCellValue("鍔犱繚浜烘暟");
+ header1.createCell(11).setCellValue("鍑忎繚浜烘暟");
for (int i = 0; i < 12; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,2));
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,6,8));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,6,7));
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(data.getCompanyName());
header2.createCell(1).setCellValue("");
- header2.createCell(2).setCellValue("");
- header2.createCell(3).setCellValue(data.getSolutionsName());
- header2.createCell(4).setCellValue(data.getApplyCode());
- header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+ header2.createCell(2).setCellValue(data.getSolutionsName());
+ header2.createCell(3).setCellValue(data.getApplyCode());
+ header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+ header2.createCell(5).setCellValue("");
header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(7).setCellValue("");
- header2.createCell(8).setCellValue("");
- header2.createCell(9).setCellValue(data.getAddNum());
- header2.createCell(10).setCellValue(data.getDelNum());
- header2.createCell(11).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,2));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,6,8));
+ 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());
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,4,5));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,6,7));
for (int i = 0; i < 12; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
}
@@ -805,16 +833,18 @@
Row header4 = sheet.createRow(4);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("澶囨敞");
header4.createCell(6).setCellValue("搴忓彿");
header4.createCell(7).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(8).setCellValue("鎬у埆");
- header4.createCell(9).setCellValue("韬唤璇佸彿");
- header4.createCell(10).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(11).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(8).setCellValue("鎬у埆");
+ header4.createCell(8).setCellValue("韬唤璇佸彿");
+ header4.createCell(9).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(10).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(11).setCellValue("澶囨敞");
for (int i = 0; i < 12; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
}
@@ -827,10 +857,11 @@
if(addModel!=null){
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
}else{
for (int i = 0; i < 6; i++) {
header5.createCell(i).setCellValue("");
@@ -839,10 +870,11 @@
if(delModel!=null){
header5.createCell(6).setCellValue(rowIndex+1);
header5.createCell(7).setCellValue(StringUtils.defaultString(delModel.getMemberName(),""));
- header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
- header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
- header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
- header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+// header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(8).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
+ header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
+ header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+ header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getRemark(),""));
}else{
for (int i =6; i < 12; i++) {
header5.createCell(i).setCellValue("");
@@ -888,8 +920,8 @@
InputStream in = new ByteArrayInputStream(bookByteAry);
String tempExcel = saveIsToFile(in);
String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
-// ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
- ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//杞琍DF
+// ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
+ ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
File f = new File(tempPdf);
if(f!=null && f.isFile() && f.length()>0){
return tempPdf;
@@ -912,7 +944,7 @@
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
for (int i = 0; i < 8; i++) {
- sheet.setColumnWidth(i, ((i==3|| i== 5 || i==7)?16:8) * 2 * 256);
+ sheet.setColumnWidth(i, ((i==2|| i==3 || i==6|| i==7|| i==4|| i==5)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,7));
@@ -929,8 +961,8 @@
}
Row header1 = sheet.createRow(1);
header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
- header1.createCell(1).setCellValue("淇濋櫓鏂规");
- header1.createCell(2).setCellValue("");
+ header1.createCell(1).setCellValue("");
+ header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濆崟鍙�");
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
@@ -939,30 +971,31 @@
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,1,2));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(data.getCompanyName());
- header2.createCell(1).setCellValue(data.getSolutionsName());
- header2.createCell(2).setCellValue("");
+ header2.createCell(1).setCellValue("");
+ header2.createCell(2).setCellValue(data.getSolutionsName());
header2.createCell(3).setCellValue(data.getApplyCode());
header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(6).setCellValue(data.getChangeNum());
header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,1,2));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
for (int i = 0; i < 8; i++) {
configDataCell(sxssfWorkbook,header2.getCell(i));
}
Row header4 = sheet.createRow(3);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("鍘熸淳閬ｅ崟浣�");
- header4.createCell(5).setCellValue("鍘熸墍鎵�灞炲伐绉�");
- header4.createCell(6).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
- header4.createCell(7).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("鍘熸淳閬ｅ崟浣�");
+ header4.createCell(4).setCellValue("鍘熸墍鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
+ header4.createCell(6).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+ header4.createCell(7).setCellValue("澶囨敞");
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
}
@@ -972,12 +1005,13 @@
Row header5 = sheet.createRow(rowIndex + 4);
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
- header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
- header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+ header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+ header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
for (int i = 0; i < 8; i++) {
configDataCell(sxssfWorkbook,header5.getCell(i));
}
@@ -1007,12 +1041,12 @@
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
for (int i = 0; i < 8; i++) {
- sheet.setColumnWidth(i, ((i==3|| i== 4|| i== 5 ||i== 6 || i==7)?16:8) * 2 * 256);
+ sheet.setColumnWidth(i, ((i==2|| i==3 || i==6|| i==7|| i==4|| i==5)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,7));
Row title = sheet.createRow(0);
- title.setHeight((short) 2000);
+ title.setHeight((short) 1000);
Cell c = title.createCell(0);
c.setCellValue(sheetName);
configFirstCell(sxssfWorkbook,c);
@@ -1024,8 +1058,8 @@
}
Row header1 = sheet.createRow(1);
header1.createCell(0).setCellValue(cellValue);
- header1.createCell(1).setCellValue("淇濋櫓鏂规");
- header1.createCell(2).setCellValue("");
+ header1.createCell(1).setCellValue("");
+ header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濆崟鍙�");
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
@@ -1034,30 +1068,31 @@
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,1,2));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(data.getCompanyName());
- header2.createCell(1).setCellValue(data.getSolutionsName());
- header2.createCell(2).setCellValue("");
+ header2.createCell(1).setCellValue("");
+ header2.createCell(2).setCellValue(data.getSolutionsName());
header2.createCell(3).setCellValue(data.getApplyCode());
header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(6).setCellValue(data.getChangeNum());
header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,1,2));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
for (int i = 0; i < 8; i++) {
configDataCell(sxssfWorkbook,header2.getCell(i));
}
Row header4 = sheet.createRow(3);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("鍘熸淳閬ｅ崟浣�");
- header4.createCell(5).setCellValue("鍘熸墍鎵�灞炲伐绉�");
- header4.createCell(6).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
- header4.createCell(7).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("鍘熸淳閬ｅ崟浣�");
+ header4.createCell(4).setCellValue("鍘熸墍鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
+ header4.createCell(6).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+ header4.createCell(7).setCellValue("澶囨敞");
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
}
@@ -1067,12 +1102,13 @@
Row header5 = sheet.createRow(rowIndex + 4);
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
- header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
- header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+ header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+ header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
for (int i = 0; i < 8; i++) {
configDataCell(sxssfWorkbook,header5.getCell(i));
}
@@ -1113,8 +1149,8 @@
InputStream in = new ByteArrayInputStream(bookByteAry);
String tempExcel = saveIsToFile(in);
String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
-// ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
- ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//杞琍DF
+// ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
+ ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
File f = new File(tempPdf);
if(f!=null && f.isFile() && f.length()>0){
return tempPdf;
@@ -1178,10 +1214,11 @@
Row header4 = sheet.createRow(3);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(5).setCellValue("鎵�鎵�灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(5).setCellValue("澶囨敞");
for (int i = 0; i < 6; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
}
@@ -1191,10 +1228,11 @@
Row header5 = sheet.createRow(rowIndex + 4);
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
for (int i = 0; i < 6; i++) {
configDataCell(sxssfWorkbook,header5.getCell(i));
}
@@ -1218,7 +1256,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("");
@@ -1235,8 +1273,8 @@
InputStream in = new ByteArrayInputStream(bookByteAry);
String tempExcel = saveIsToFile(in);
String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
-// ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
- ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//杞琍DF
+// ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
+ ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
File f = new File(tempPdf);
if(f!=null && f.isFile() && f.length()>0){
return tempPdf;
@@ -1305,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));
@@ -1316,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));
@@ -1324,11 +1362,12 @@
Row header4 = sheet.createRow(3);
header4.createCell(0).setCellValue("搴忓彿");
header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header4.createCell(2).setCellValue("鎬у埆");
- header4.createCell(3).setCellValue("韬唤璇佸彿");
- header4.createCell(4).setCellValue("琚繚闄╀汉");
- header4.createCell(5).setCellValue("娲鹃仯鍗曚綅");
- header4.createCell(6).setCellValue("鎵�灞炲伐绉�");
+// header4.createCell(2).setCellValue("鎬у埆");
+ header4.createCell(2).setCellValue("韬唤璇佸彿");
+ header4.createCell(3).setCellValue("琚繚闄╀汉");
+ header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
+ header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+ header4.createCell(6).setCellValue("澶囨敞");
header4.setHeight((short) 500);
for (int i = 0; i < 7; i++) {
configFirstCell(sxssfWorkbook,header4.getCell(i));
@@ -1341,11 +1380,12 @@
// header5.setHeight((short) 300);
header5.createCell(0).setCellValue(rowIndex+1);
header5.createCell(1).setCellValue(StringUtils.defaultString(d.getMemberName(),""));
- header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
- header5.createCell(3).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
- header5.createCell(4).setCellValue(StringUtils.defaultString(d.getCompanyName(),""));
- header5.createCell(5).setCellValue(StringUtils.defaultString(d.getDuName(),""));
- header5.createCell(6).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+// header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
+ header5.createCell(2).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
+ header5.createCell(3).setCellValue(StringUtils.defaultString(d.getCompanyName(),""));
+ header5.createCell(4).setCellValue(StringUtils.defaultString(d.getDuName(),""));
+ header5.createCell(5).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+ header5.createCell(6).setCellValue(StringUtils.defaultString(d.getRemark(),""));
// 璁剧疆鏁版嵁鍗曞厓鏍�
for (int i = 0; i < 7; i++) {
configDataCell(sxssfWorkbook, header5.getCell(i));
@@ -1395,7 +1435,7 @@
sheet.createFreezePane(0, 1);
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,8));
Row title = sheet.createRow(0);
- title.setHeight((short) 2000);
+ title.setHeight((short) 1000);
Cell c = title.createCell(0);
c.setCellValue(sheetName);
configFirstCell(sxssfWorkbook,c);
@@ -1407,49 +1447,56 @@
}
Row header1 = sheet.createRow(1);
header1.createCell(0).setCellValue("鎶曚繚浜�");
- header1.createCell(1).setCellValue("淇濋櫓鏂规");
- header1.createCell(2).setCellValue("");
- header1.createCell(3).setCellValue("");
+ header1.createCell(1).setCellValue("");
+ header1.createCell(2).setCellValue("淇濋櫓鏂规");
+ header1.createCell(3).setCellValue("");
header1.createCell(4).setCellValue("淇濆崟鍙�");
header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(7).setCellValue("鎹㈠巶浜烘暟");
header1.createCell(8).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,2,3));
+
for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,1,3));
-
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(data.getShopName());
- header2.createCell(1).setCellValue(data.getSolutionsName());
- header2.createCell(2).setCellValue("");
+ header2.createCell(1).setCellValue("");
+ header2.createCell(2).setCellValue(data.getSolutionsName());
header2.createCell(3).setCellValue("");
header2.createCell(4).setCellValue(data.getApplyCode());
header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(7).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.TWO)).collect(Collectors.toList()).size());
- header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,1,3));
+ header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
+// sheet.addMergedRegion(new CellRangeAddress(2 ,2,1,3));
+
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,2,3));
for (int i = 0; i < 9; i++) {
configDataCell(sxssfWorkbook,header2.getCell(i));
}
-
Row header3 = sheet.createRow(3);
header3.createCell(0).setCellValue("琚繚闄╀汉");
- header3.createCell(1).setCellValue(data.getCompanyNames());
- header3.createCell(2).setCellValue("");
+ header3.createCell(1).setCellValue("");
+ header3.createCell(2).setCellValue(data.getCompanyNames());
header3.createCell(3).setCellValue("");
header3.createCell(4).setCellValue("");
header3.createCell(5).setCellValue("");
header3.createCell(6).setCellValue("");
header3.createCell(7).setCellValue("");
header3.createCell(8).setCellValue("");
- for (int i = 0; i < 9; i++) {
+ for (int i = 0; i < 2; i++) {
configFirstCell(sxssfWorkbook,header3.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,8));
-
+ for (int i = 2; i < 9; i++) {
+ configDataCell(sxssfWorkbook,header3.getCell(i));
+ }
+ sheet.addMergedRegion(new CellRangeAddress(3 ,3,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(3 ,3,2,8));
List<ApplyChagneDetail> otherChangeDetailList = data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.TWO)).collect(Collectors.toList());
@@ -1461,13 +1508,14 @@
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header5.createCell(2).setCellValue("鎬у埆");
- header5.createCell(3).setCellValue("韬唤璇佸彿");
- header5.createCell(4).setCellValue("琚繚闄╀汉");
- header5.createCell(5).setCellValue("鍘熸淳閬ｅ崟浣�");
- header5.createCell(6).setCellValue("鍘熸墍灞炲伐绉�");
- header5.createCell(7).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
- header5.createCell(8).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+// header5.createCell(2).setCellValue("鎬у埆");
+ header5.createCell(2).setCellValue("韬唤璇佸彿");
+ header5.createCell(3).setCellValue("琚繚闄╀汉");
+ header5.createCell(4).setCellValue("鍘熸淳閬ｅ崟浣�");
+ header5.createCell(5).setCellValue("鍘熸墍灞炲伐绉�");
+ header5.createCell(6).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
+ header5.createCell(7).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+ header5.createCell(8).setCellValue("澶囨敞");
for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
@@ -1477,18 +1525,19 @@
ApplyChagneDetail applyChagneDetail = otherChangeDetailList.get(rowIndex);
header6.createCell(0).setCellValue(rowIndex + 1);
header6.createCell(1).setCellValue(applyChagneDetail.getMemberName());
- header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
- header6.createCell(3).setCellValue(applyChagneDetail.getIdcardNo());
- header6.createCell(4).setCellValue(applyChagneDetail.getCompanyName());
- header6.createCell(5).setCellValue(applyChagneDetail.getOldDuName());
- header6.createCell(6).setCellValue(applyChagneDetail.getOldWorkTypeName());
- header6.createCell(7).setCellValue(applyChagneDetail.getDuName());
- header6.createCell(8).setCellValue(applyChagneDetail.getWorkTypeName());
+// header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+ header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
+ header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
+ header6.createCell(4).setCellValue(applyChagneDetail.getOldDuName());
+ header6.createCell(5).setCellValue(applyChagneDetail.getOldWorkTypeName());
+ header6.createCell(6).setCellValue(applyChagneDetail.getDuName());
+ header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
for (int i = 0; i < 9; i++) {
- configFirstCell(sxssfWorkbook,header6.getCell(i));
- }
+ configDataCell(sxssfWorkbook,header6.getCell(i));
+ }
}
- }
+ }
int rowIndex = row + 1 ;
Row header6= sheet.createRow(rowIndex);
header6.createCell(0).setCellValue("鎶曚繚浼佷笟鐢虫槑:\n" +
@@ -1525,8 +1574,8 @@
InputStream in = new ByteArrayInputStream(bookByteAry);
String tempExcel = saveIsToFile(in);
String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
-// ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
- ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//杞琍DF
+// ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
+ ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
File f = new File(tempPdf);
if(f!=null && f.isFile() && f.length()>0){
return tempPdf;
@@ -1549,14 +1598,14 @@
try {
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
- for (int i = 0; i < 12; i++) {
- sheet.setColumnWidth(i, ((i==3|| i==4|| i== 5 || i==9||i==10|| i==11)?16:8) * 2 * 256);
+ for (int i = 0; i < 9; i++) {
+ sheet.setColumnWidth(i, ((i==0|| i==1|| i== 3|| i== 4|| i== 7|| i== 8)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
- sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,11));
+ sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,8));
Row title = sheet.createRow(0);
title.setHeight((short) 2000);
- for (int i = 0; i < 12; i++) {
+ for (int i = 0; i < 9; i++) {
title.createCell(i).setCellValue(i==0?sheetName:"");
configTitleCell(sxssfWorkbook,title.getCell(i));
}
@@ -1568,8 +1617,9 @@
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(5).setCellValue("鍔犱繚浜烘暟");
header1.createCell(6).setCellValue("鍑忎繚浜烘暟");
- header1.createCell(7).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
- for (int i = 0; i < 8; i++) {
+ header1.createCell(7).setCellValue("鎵瑰鐢熸晥鏃ユ湡");
+ header1.createCell(8).setCellValue("鎵瑰噺鐢熸晥鏃ユ湡");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
@@ -1581,8 +1631,9 @@
header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(5).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList()).size());
header2.createCell(6).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList()).size());
- header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
- for (int i = 0; i < 8; i++) {
+ header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
+ header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
+ for (int i = 0; i < 9; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
}
@@ -1595,20 +1646,21 @@
header3.createCell(5).setCellValue("");
header3.createCell(6).setCellValue("");
header3.createCell(7).setCellValue("");
- for (int i = 0; i < 8; i++) {
+ header3.createCell(8).setCellValue("");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header3.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,7));
-
- Integer row = 4;
+ sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,8));
+ 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++) {
configFirstCell(sxssfWorkbook, header4.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,0,8));
row = row + 1;
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
@@ -1619,7 +1671,8 @@
header5.createCell(5).setCellValue("娲鹃仯鍗曚綅");
header5.createCell(6).setCellValue("");
header5.createCell(7).setCellValue("鎵�灞炲伐绉�");
- for (int i = 0; i < 8; i++) {
+ header5.createCell(8).setCellValue("澶囨敞");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
@@ -1635,8 +1688,9 @@
header6.createCell(5).setCellValue(applyChagneDetail.getDuName());
header6.createCell(6).setCellValue("");
header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
- for (int i = 0; i < 8; i++) {
- configFirstCell(sxssfWorkbook,header6.getCell(i));
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
+ for (int i = 0; i < 9; i++) {
+ configDataCell(sxssfWorkbook,header6.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
}
@@ -1647,10 +1701,10 @@
if(CollectionUtils.isNotEmpty(reduceChangeDetailList)){
Row header4 = sheet.createRow(row);
header4.createCell(0).setCellValue("鍑忎繚浜哄憳");
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook, header4.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,0,8));
row = row + 1;
Row header5 = sheet.createRow(row);
@@ -1662,14 +1716,14 @@
header5.createCell(5).setCellValue("娲鹃仯鍗曚綅");
header5.createCell(6).setCellValue("");
header5.createCell(7).setCellValue("鎵�灞炲伐绉�");
- for (int i = 0; i < 8; i++) {
+ header5.createCell(8).setCellValue("澶囨敞");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,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);
@@ -1680,10 +1734,12 @@
header6.createCell(5).setCellValue(applyChagneDetail.getDuName());
header6.createCell(6).setCellValue("");
header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
- for (int i = 0; i < 8; i++) {
- configFirstCell(sxssfWorkbook,header6.getCell(i));
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
+ for (int i = 0; i < 9; i++) {
+ configDataCell(sxssfWorkbook,header6.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
+ row = row + 1;
}
}
@@ -1693,27 +1749,27 @@
"1銆佸湪鐢宠涔︿笂濉啓鐨勪竴鍒囧唴瀹瑰睘瀹烇紝鍚﹀垯鏈紒涓氭壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
"2銆佺敱浜庡彉鏇村彈鐩婁汉浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
"3銆佹湰鐢宠琛ㄧ殑绛剧珷涓烘湰浼佷笟浜茶嚜绛剧讲锛屽鐢辨浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n");
- for (int i = 1; i < 8; i++) {
+ for (int i = 1; i < 9; i++) {
header6.createCell(i).setCellValue("");
}
- for (int i =0; i < 8; i++) {
+ for (int i =0; i < 9; i++) {
if(i>0){
header6.createCell(i).setCellValue("");
}
configInfoCell(sxssfWorkbook,header6.getCell(i),HorizontalAlignment.LEFT);
}
header6.setHeight((short) 2000);
- sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,0,11));
+ sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,0,8));
Row header7= sheet.createRow(rowIndex+1);
header7.setHeight((short) 3000);
header7.createCell(0).setCellValue("鎶曚繚浜虹绔� 锛� \n \n \n" +"鏃ユ湡锛� 骞� 鏈� 鏃� ");
- for (int i =0; i < 8; i++) {
+ for (int i =0; i < 9; i++) {
if(i>0){
header7.createCell(i).setCellValue("");
}
configInfoCell(sxssfWorkbook,header7.getCell(i),HorizontalAlignment.RIGHT);
}
- sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,11));
+ sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,8));
//涓存椂缂撳啿鍖�
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -1722,9 +1778,9 @@
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";
-// ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
- ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//杞琍DF
+ 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);
if(f!=null && f.isFile() && f.length()>0){
return tempPdf;
@@ -1766,14 +1822,14 @@
try {
sxssfWorkbook = new SXSSFWorkbook();
Sheet sheet = sxssfWorkbook.createSheet(sheetName);
- for (int i = 0; i < 8; i++) {
- sheet.setColumnWidth(i, ((i==3|| i==4|| i== 5 )?16:8) * 2 * 256);
+ for (int i = 0; i < 9; i++) {
+ sheet.setColumnWidth(i, ((i==0|| i==1|| i== 3|| i== 4|| i== 7|| i== 8)?16:8) * 2 * 256);
}
sheet.createFreezePane(0, 1);
- sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,8));
Row title = sheet.createRow(0);
title.setHeight((short) 2000);
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 9; i++) {
title.createCell(i).setCellValue(i==0?sheetName:"");
configTitleCell(sxssfWorkbook,title.getCell(i));
}
@@ -1785,8 +1841,9 @@
header1.createCell(4).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(5).setCellValue("鍔犱繚浜烘暟");
header1.createCell(6).setCellValue("鍑忎繚浜烘暟");
- header1.createCell(7).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
- for (int i = 0; i < 8; i++) {
+ header1.createCell(7).setCellValue("鎵瑰鐢熸晥鏃ユ湡");
+ header1.createCell(8).setCellValue("鎵瑰噺鐢熸晥鏃ユ湡");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
@@ -1798,8 +1855,9 @@
header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(5).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList()).size());
header2.createCell(6).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList()).size());
- header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
- for (int i = 0; i < 8; i++) {
+ header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
+ header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
+ for (int i = 0; i < 9; i++) {
configDataCell(sxssfWorkbook, header2.getCell(i));
}
@@ -1812,11 +1870,11 @@
header3.createCell(5).setCellValue("");
header3.createCell(6).setCellValue("");
header3.createCell(7).setCellValue("");
- for (int i = 0; i < 8; i++) {
+ header3.createCell(8).setCellValue("");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header3.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,7));
-
+ sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,8));
Integer row = 4;
List<ApplyChagneDetail> addChangeDetailList = data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(addChangeDetailList)){
@@ -1825,7 +1883,7 @@
for (int i = 0; i < 8; i++) {
configFirstCell(sxssfWorkbook, header4.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,0,8));
row = row + 1;
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
@@ -1836,7 +1894,8 @@
header5.createCell(5).setCellValue("娲鹃仯鍗曚綅");
header5.createCell(6).setCellValue("");
header5.createCell(7).setCellValue("鎵�灞炲伐绉�");
- for (int i = 0; i < 8; i++) {
+ header5.createCell(8).setCellValue("澶囨敞");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
@@ -1852,8 +1911,9 @@
header6.createCell(5).setCellValue(applyChagneDetail.getDuName());
header6.createCell(6).setCellValue("");
header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
- for (int i = 0; i < 8; i++) {
- configFirstCell(sxssfWorkbook,header6.getCell(i));
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
+ for (int i = 0; i < 9; i++) {
+ configDataCell(sxssfWorkbook,header6.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
}
@@ -1864,10 +1924,10 @@
if(CollectionUtils.isNotEmpty(reduceChangeDetailList)){
Row header4 = sheet.createRow(row);
header4.createCell(0).setCellValue("鍑忎繚浜哄憳");
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook, header4.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(row ,row,0,7));
+ sheet.addMergedRegion(new CellRangeAddress(row ,row,0,8));
row = row + 1;
Row header5 = sheet.createRow(row);
@@ -1879,7 +1939,8 @@
header5.createCell(5).setCellValue("娲鹃仯鍗曚綅");
header5.createCell(6).setCellValue("");
header5.createCell(7).setCellValue("鎵�灞炲伐绉�");
- for (int i = 0; i < 8; i++) {
+ header5.createCell(8).setCellValue("澶囨敞");
+ for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
@@ -1897,8 +1958,9 @@
header6.createCell(5).setCellValue(applyChagneDetail.getDuName());
header6.createCell(6).setCellValue("");
header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
- for (int i = 0; i < 8; i++) {
- configFirstCell(sxssfWorkbook,header6.getCell(i));
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
+ for (int i = 0; i < 9; i++) {
+ configDataCell(sxssfWorkbook,header6.getCell(i));
}
sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6));
}
@@ -1930,7 +1992,7 @@
sheet.createFreezePane(0, 1);
sheet.addMergedRegion(new CellRangeAddress(0 ,0,0,8));
Row title = sheet.createRow(0);
- title.setHeight((short) 2000);
+ title.setHeight((short) 1000);
Cell c = title.createCell(0);
c.setCellValue(sheetName);
configFirstCell(sxssfWorkbook,c);
@@ -1942,49 +2004,56 @@
}
Row header1 = sheet.createRow(1);
header1.createCell(0).setCellValue("鎶曚繚浜�");
- header1.createCell(1).setCellValue("淇濋櫓鏂规");
- header1.createCell(2).setCellValue("");
+ header1.createCell(1).setCellValue("");
+ header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("");
header1.createCell(4).setCellValue("淇濆崟鍙�");
header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
header1.createCell(7).setCellValue("鎹㈠巶浜烘暟");
header1.createCell(8).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(1 ,1,2,3));
+
for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header1.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(1 ,1,1,3));
-
Row header2 = sheet.createRow(2);
header2.createCell(0).setCellValue(data.getShopName());
- header2.createCell(1).setCellValue(data.getSolutionsName());
- header2.createCell(2).setCellValue("");
+ header2.createCell(1).setCellValue("");
+ header2.createCell(2).setCellValue(data.getSolutionsName());
header2.createCell(3).setCellValue("");
header2.createCell(4).setCellValue(data.getApplyCode());
header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
header2.createCell(7).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.TWO)).collect(Collectors.toList()).size());
header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
- sheet.addMergedRegion(new CellRangeAddress(2 ,2,1,3));
+// sheet.addMergedRegion(new CellRangeAddress(2 ,2,1,3));
+
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(2 ,2,2,3));
for (int i = 0; i < 9; i++) {
configDataCell(sxssfWorkbook,header2.getCell(i));
}
-
Row header3 = sheet.createRow(3);
header3.createCell(0).setCellValue("琚繚闄╀汉");
- header3.createCell(1).setCellValue(data.getCompanyNames());
- header3.createCell(2).setCellValue("");
+ header3.createCell(1).setCellValue("");
+ header3.createCell(2).setCellValue(data.getCompanyNames());
header3.createCell(3).setCellValue("");
header3.createCell(4).setCellValue("");
header3.createCell(5).setCellValue("");
header3.createCell(6).setCellValue("");
header3.createCell(7).setCellValue("");
header3.createCell(8).setCellValue("");
- for (int i = 0; i < 9; i++) {
+ for (int i = 0; i < 2; i++) {
configFirstCell(sxssfWorkbook,header3.getCell(i));
}
- sheet.addMergedRegion(new CellRangeAddress(3 ,3,1,8));
-
+ for (int i = 2; i < 9; i++) {
+ configDataCell(sxssfWorkbook,header3.getCell(i));
+ }
+ sheet.addMergedRegion(new CellRangeAddress(3 ,3,0,1));
+ sheet.addMergedRegion(new CellRangeAddress(3 ,3,2,8));
List<ApplyChagneDetail> otherChangeDetailList = data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.TWO)).collect(Collectors.toList());
@@ -1996,13 +2065,14 @@
Row header5 = sheet.createRow(row);
header5.createCell(0).setCellValue("搴忓彿");
header5.createCell(1).setCellValue("鍛樺伐濮撳悕");
- header5.createCell(2).setCellValue("鎬у埆");
- header5.createCell(3).setCellValue("韬唤璇佸彿");
- header5.createCell(4).setCellValue("琚繚闄╀汉");
- header5.createCell(5).setCellValue("鍘熸淳閬ｅ崟浣�");
- header5.createCell(6).setCellValue("鍘熸墍灞炲伐绉�");
- header5.createCell(7).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
- header5.createCell(8).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+// header5.createCell(2).setCellValue("鎬у埆");
+ header5.createCell(2).setCellValue("韬唤璇佸彿");
+ header5.createCell(3).setCellValue("琚繚闄╀汉");
+ header5.createCell(4).setCellValue("鍘熸淳閬ｅ崟浣�");
+ header5.createCell(5).setCellValue("鍘熸墍灞炲伐绉�");
+ header5.createCell(6).setCellValue("鏇存敼鍚庢淳閬ｅ崟浣�");
+ header5.createCell(7).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+ header5.createCell(8).setCellValue("澶囨敞");
for (int i = 0; i < 9; i++) {
configFirstCell(sxssfWorkbook,header5.getCell(i));
}
@@ -2012,15 +2082,16 @@
ApplyChagneDetail applyChagneDetail = otherChangeDetailList.get(rowIndex);
header6.createCell(0).setCellValue(rowIndex + 1);
header6.createCell(1).setCellValue(applyChagneDetail.getMemberName());
- header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
- header6.createCell(3).setCellValue(applyChagneDetail.getIdcardNo());
- header6.createCell(4).setCellValue(applyChagneDetail.getCompanyName());
- header6.createCell(5).setCellValue(applyChagneDetail.getOldDuName());
- header6.createCell(6).setCellValue(applyChagneDetail.getOldWorkTypeName());
- header6.createCell(7).setCellValue(applyChagneDetail.getDuName());
- header6.createCell(8).setCellValue(applyChagneDetail.getWorkTypeName());
+// header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+ header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
+ header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
+ header6.createCell(4).setCellValue(applyChagneDetail.getOldDuName());
+ header6.createCell(5).setCellValue(applyChagneDetail.getOldWorkTypeName());
+ header6.createCell(6).setCellValue(applyChagneDetail.getDuName());
+ header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
+ header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
for (int i = 0; i < 9; i++) {
- configFirstCell(sxssfWorkbook,header6.getCell(i));
+ configDataCell(sxssfWorkbook,header6.getCell(i));
}
}
}
--
Gitblit v1.9.3