git ch

k94314517

2024-06-07 2fe8bdc756dca24e7b62b99423b64c9b674faa9d

 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,7 +515,7 @@
            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("保险生效止期");
@@ -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);//转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;
@@ -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);//转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;
@@ -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);//转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;
@@ -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));
@@ -1468,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));
                }
@@ -1484,13 +1525,14 @@
                    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++) {
                        configDataCell(sxssfWorkbook,header6.getCell(i));
                    }
@@ -1532,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;
@@ -1556,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));
            }
@@ -1575,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));
            }

@@ -1588,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));
            }

@@ -1602,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("序号");
@@ -1626,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));
@@ -1642,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));
                }
@@ -1654,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);
@@ -1669,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);
@@ -1687,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++) {
                    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;
                }
            }

@@ -1700,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();
@@ -1729,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;
@@ -1773,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));
            }
@@ -1792,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));
            }

@@ -1806,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));
            }

@@ -1819,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)){
@@ -1833,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("序号");
@@ -1844,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));
@@ -1860,7 +1911,8 @@
                    header6.createCell(5).setCellValue(applyChagneDetail.getDuName());
                    header6.createCell(6).setCellValue("");
                    header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
                    for (int i = 0; i < 8; 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));
@@ -1872,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);
@@ -1887,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));
@@ -1905,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));
                }
@@ -2011,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));
                }
@@ -2027,13 +2082,14 @@
                    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++) {
                        configDataCell(sxssfWorkbook,header6.getCell(i));
                    }