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 | 267 +++++++++++++++++++++++++++-------------------------- 1 files changed, 136 insertions(+), 131 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 1729e96..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("淇濆崟鍙�"); @@ -811,7 +812,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()); @@ -919,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; @@ -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("淇濆崟鍙�"); @@ -1148,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; @@ -1255,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(""); @@ -1272,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; @@ -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)); @@ -1573,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; @@ -1597,14 +1598,14 @@ try { sxssfWorkbook = new SXSSFWorkbook(); Sheet sheet = sxssfWorkbook.createSheet(sheetName); - for (int i = 0; i < 8; i++) { - sheet.setColumnWidth(i, ((i==0|| i==1|| i== 3|| i== 4|| i== 7)?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)); } @@ -1616,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)); } @@ -1629,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)); } @@ -1643,52 +1646,53 @@ 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("搴忓彿"); header5.createCell(1).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("澶囨敞"); - for (int i = 0; i < 8; i++) { + 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)); } - sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5)); + sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6)); for (int rowIndex = 0; rowIndex < addChangeDetailList.size(); rowIndex++) { row = row + 1 ; Row header6 = sheet.createRow(row); ApplyChagneDetail applyChagneDetail = addChangeDetailList.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(2).setCellValue(applyChagneDetail.getIdcardNo()); - header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName()); - header6.createCell(4).setCellValue(applyChagneDetail.getDuName()); - header6.createCell(5).setCellValue(""); - header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName()); - header6.createCell(7).setCellValue(applyChagneDetail.getRemark()); - for (int i = 0; i < 8; i++) { - configFirstCell(sxssfWorkbook,header6.getCell(i)); + 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.getDuName()); + header6.createCell(6).setCellValue(""); + header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName()); + header6.createCell(8).setCellValue(applyChagneDetail.getRemark()); + for (int i = 0; i < 9; i++) { + configDataCell(sxssfWorkbook,header6.getCell(i)); } - sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5)); + sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6)); } } @@ -1697,45 +1701,45 @@ 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); header5.createCell(0).setCellValue("搴忓彿"); header5.createCell(1).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("澶囨敞"); - for (int i = 0; i < 8; i++) { + 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)); } - sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5)); + 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); header6.createCell(1).setCellValue(applyChagneDetail.getMemberName()); -// 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.getDuName()); - header6.createCell(5).setCellValue(""); - header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName()); - header6.createCell(7).setCellValue(applyChagneDetail.getRemark()); - for (int i = 0; i < 8; i++) { + 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.getDuName()); + header6.createCell(6).setCellValue(""); + header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName()); + header6.createCell(8).setCellValue(applyChagneDetail.getRemark()); + for (int i = 0; i < 9; i++) { configDataCell(sxssfWorkbook,header6.getCell(i)); } - sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5)); + sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6)); + row = row + 1; } } @@ -1745,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,7)); + 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,7)); + sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,8)); //涓存椂缂撳啿鍖� ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -1774,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; @@ -1818,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) 1000); - for (int i = 0; i < 8; i++) { + title.setHeight((short) 2000); + for (int i = 0; i < 9; i++) { title.createCell(i).setCellValue(i==0?sheetName:""); configTitleCell(sxssfWorkbook,title.getCell(i)); } @@ -1837,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)); } @@ -1851,7 +1856,8 @@ 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.getApplyStartTime())); - for (int i = 0; i < 8; i++) { + header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime())); + for (int i = 0; i < 9; i++) { configDataCell(sxssfWorkbook, header2.getCell(i)); } @@ -1864,12 +1870,11 @@ header3.createCell(5).setCellValue(""); header3.createCell(6).setCellValue(""); header3.createCell(7).setCellValue(""); - configFirstCell(sxssfWorkbook,header3.getCell(0)); - for (int i = 1; i < 8; i++) { - configDataCell(sxssfWorkbook,header3.getCell(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)){ @@ -1878,39 +1883,39 @@ 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("搴忓彿"); header5.createCell(1).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("澶囨敞"); - for (int i = 0; i < 8; i++) { + 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)); } - sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5)); + sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6)); for (int rowIndex = 0; rowIndex < addChangeDetailList.size(); rowIndex++) { row = row + 1 ; Row header6 = sheet.createRow(row); ApplyChagneDetail applyChagneDetail = addChangeDetailList.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(2).setCellValue(applyChagneDetail.getIdcardNo()); - header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName()); - header6.createCell(4).setCellValue(applyChagneDetail.getDuName()); - header6.createCell(5).setCellValue(""); - header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName()); - header6.createCell(7).setCellValue(applyChagneDetail.getRemark()); - for (int i = 0; i < 8; i++) { + 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.getDuName()); + header6.createCell(6).setCellValue(""); + header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName()); + header6.createCell(8).setCellValue(applyChagneDetail.getRemark()); + for (int i = 0; i < 9; i++) { configDataCell(sxssfWorkbook,header6.getCell(i)); } - sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5)); + sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6)); } } @@ -1919,26 +1924,26 @@ 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); header5.createCell(0).setCellValue("搴忓彿"); header5.createCell(1).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("澶囨敞"); - for (int i = 0; i < 8; i++) { + 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)); } - sheet.addMergedRegion(new CellRangeAddress(row ,row,4,5)); + sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6)); row = row + 1 ; for (int rowIndex = 0; rowIndex < reduceChangeDetailList.size(); rowIndex++) { @@ -1947,17 +1952,17 @@ ApplyChagneDetail applyChagneDetail = reduceChangeDetailList.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(2).setCellValue(applyChagneDetail.getIdcardNo()); - header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName()); - header6.createCell(4).setCellValue(applyChagneDetail.getDuName()); - header6.createCell(5).setCellValue(""); - header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName()); - header6.createCell(7).setCellValue(applyChagneDetail.getRemark()); - for (int i = 0; i < 8; i++) { - configFirstCell(sxssfWorkbook,header6.getCell(i)); + 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.getDuName()); + header6.createCell(6).setCellValue(""); + header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName()); + header6.createCell(8).setCellValue(applyChagneDetail.getRemark()); + for (int i = 0; i < 9; i++) { + configDataCell(sxssfWorkbook,header6.getCell(i)); } - sheet.addMergedRegion(new CellRangeAddress(row ,row,2,3)); + sheet.addMergedRegion(new CellRangeAddress(row ,row,5,6)); } } sxssfWorkbook.write(os); -- Gitblit v1.9.3