git ch

k94314517

2024-05-24 df59cad917c6db1db3b36a23f4b3e7be510e9ed0

 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java

@@ -783,7 +783,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 +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());
@@ -919,8 +919,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);//转PDF
            ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//转PDF
//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//转PDF
            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//转PDF
            File f = new File(tempPdf);
            if(f!=null && f.isFile() && f.length()>0){
                return tempPdf;
@@ -1056,7 +1056,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 +1148,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);//转PDF
            ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//转PDF
//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//转PDF
            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//转PDF
            File f = new File(tempPdf);
            if(f!=null && f.isFile() && f.length()>0){
                return tempPdf;
@@ -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("");
@@ -1272,8 +1272,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);//转PDF
            ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//转PDF
//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//转PDF
            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//转PDF
            File f = new File(tempPdf);
            if(f!=null && f.isFile() && f.length()>0){
                return tempPdf;
@@ -1573,8 +1573,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);//转PDF
            ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//转PDF
//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//转PDF
            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//转PDF
            File f = new File(tempPdf);
            if(f!=null && f.isFile() && f.length()>0){
                return tempPdf;
@@ -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,9 +1777,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);//转PDF
            ExcelToPdfTool.excelToPdf(tempExcel,tempPdf);//转PDF
            String tempPdf =   System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf"; //"d:/1.docx";
//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//转PDF
            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//转PDF
            File f = new File(tempPdf);
            if(f!=null && f.isFile() && f.length()>0){
                return tempPdf;