提交一把

jiangping

2024-06-20 09da100729793848bc01b51f7b05ca3f1e7ec64f

 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);//转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 +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);//转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 +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);//转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;
@@ -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);//转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;
@@ -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);//转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;
@@ -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);