From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 1691 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 1,519 insertions(+), 172 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
index 83268e3..c9ce1a1 100644
--- a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
+++ b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -3,10 +3,8 @@
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.ApplyChagneDetail;
-import com.doumee.dao.business.model.ApplyChange;
-import com.doumee.dao.business.model.ApplyDetail;
-import com.doumee.dao.business.model.InsuranceApply;
+import com.doumee.dao.business.model.*;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
@@ -14,16 +12,20 @@
 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;
+import javax.swing.*;
 import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Excel瀵煎嚭瀹炵幇
@@ -231,6 +233,10 @@
         this.exportWithFirstAndEnd(data, fileName, DEFAULT_SHEET_NAME, first,end,response);
     }
 
+
+    public void exportWithSheetAndFirstAndEnd (List<T> data, String fileName,String first,String end, String sheetName, HttpServletResponse response) {
+        this.exportWithFirstAndEnd(data, fileName, sheetName, first,end,response);
+    }
     /**O
      * 鑾峰彇鍒楅泦鍚�
      */
@@ -251,11 +257,34 @@
         }
         return new ArrayList<>(sortedFields.values());
     }
-
+    /**
+     * 閰嶇疆鏁版嵁鍗曞厓鏍�
+     */
+    private void configDataCell (SXSSFWorkbook workbook, Cell cell ) {
+        if(cell == null){
+            return;
+        }
+        CellStyle style = workbook.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 璁剧疆鑳屾櫙
+//        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+//        style.setFillForegroundColor(columnConfig.dataBackgroundColor().getIndex());
+        // 瀛椾綋
+        Font font = workbook.createFont();
+        style.setFont(font);
+        // 杈规
+        configCellBorder(style);
+        style.setWrapText(true);
+        cell.setCellStyle(style);
+    }
     /**
      * 閰嶇疆鏁版嵁鍗曞厓鏍�
      */
     private void configDataCell (SXSSFWorkbook workbook, Cell cell, ExcelColumn columnConfig) {
+        if(cell == null){
+            return;
+        }
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(columnConfig.align());
         style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -282,6 +311,9 @@
      * 閰嶇疆鍒楀ご鍗曞厓鏍�
      */
     private void configHeaderCell (SXSSFWorkbook workbook, Cell cell, ExcelColumn columnConfig) {
+        if(cell == null){
+            return;
+        }
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(columnConfig.align());
         style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -304,12 +336,15 @@
      * 閰嶇疆鍒楀ご鍗曞厓鏍�
      */
     private void configFirstCell (SXSSFWorkbook workbook, Cell cell ) {
+        if(cell == null){
+            return;
+        }
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
         // 璁剧疆鑳屾櫙
         style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-//        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
         // 瀛椾綋
         Font font = workbook.createFont();
         font.setFontHeightInPoints((short)12);
@@ -319,10 +354,33 @@
         configCellBorder(style);
         cell.setCellStyle(style);
     }
+    private void configTitleCell (SXSSFWorkbook workbook, Cell cell ) {
+        if(cell == null){
+            return;
+        }
+        CellStyle style = workbook.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 璁剧疆鑳屾櫙
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+        // 瀛椾綋
+        Font font = workbook.createFont();
+        font.setFontHeightInPoints((short)12);
+        font.setBold(true);
+        style.setFont(font);
+        // 璁剧疆杈规
+        configCellBorder(style);
+//        configCellBorder(style);
+        cell.setCellStyle(style);
+    }
     /**
      * 閰嶇疆鍒楀ご鍗曞厓鏍�
      */
     private void configInfoCell (SXSSFWorkbook workbook, Cell cell,HorizontalAlignment p ) {
+        if(cell == null){
+            return;
+        }
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(p);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -334,6 +392,7 @@
         font.setFontHeightInPoints((short)12);
         font.setBold(true);
         style.setFont(font);
+        style.setWrapText(true);
         // 璁剧疆杈规
         configCellBorder(style);
         cell.setCellStyle(style);
@@ -342,6 +401,9 @@
      * 閰嶇疆鍒楀ご鍗曞厓鏍�
      */
     private void configEndCell (SXSSFWorkbook workbook, Cell cell ) {
+        if(cell == null){
+            return;
+        }
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(HorizontalAlignment.RIGHT);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -444,19 +506,24 @@
         try {
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 6; i++) {
+                sheet.setColumnWidth(i, (i==5?20:15) * 2 * 256);
+            }
             sheet.createFreezePane(0, 1);
-            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,6));
             Row title = sheet.createRow(0);
-            title.setHeight((short) 1000);
-            Cell c = title.createCell(0);
-            c.setCellValue(sheetName);
-            configFirstCell(sxssfWorkbook,c);
+            title.setHeight((short) 800);
+            for (int i = 0; i < 6; i++) {
+                title.createCell(i).setCellValue(i==0?sheetName:"");
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
+            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,5));
             Row header1 = sheet.createRow(1);
-            header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
+            header1.setHeight((short) 500);
+            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(2).setCellValue(Constants.getApplyTimeTitle(1,data));
+            header1.createCell(3).setCellValue(Constants.getApplyTimeTitle(0,data));
+            header1.createCell(4).setCellValue("鍦ㄤ繚/鎶曚繚浜烘暟");
             header1.createCell(5).setCellValue("鎬昏垂鐢紙鍏冿級");
             for (int i = 0; i < 6; i++) {
                 configFirstCell(sxssfWorkbook,header1.getCell(i));
@@ -466,19 +533,20 @@
             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());
-            //绌虹櫧琛�
-            Row header3 = sheet.createRow(3);
-            sheet.addMergedRegion(new CellRangeAddress(3  ,3,0,6));
-
-            Row header4 = sheet.createRow(4);
+            for (int i = 0; i < 6; 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(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));
             }
@@ -487,12 +555,18 @@
                 for (int rowIndex = 0; rowIndex < data.getApplyDetailList().size(); rowIndex++) {
                     ApplyDetail d = data.getApplyDetailList().get(rowIndex);
                     Row header5 = sheet.createRow(rowIndex + 4);
+//                    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));
+                    }
                 }
             }
             sxssfWorkbook.write(os);
@@ -529,6 +603,9 @@
         }
     }
 
+
+
+
     /**
      * 鍔犲噺鐢宠琛ㄥ鍑�
      * @param model
@@ -541,7 +618,7 @@
             response.setContentType("application/octet-stream");
             response.setHeader("eva-opera-type", "download");
             response.setHeader("eva-download-filename", encodeFileName);
-            this.exportJiajianBaoExcelDo(model,"鍔犲噺淇濈敵璇疯〃_", response.getOutputStream());
+            this.exportJiajianBaoExcelDo(model,"鍔犲噺淇濈敵璇疯〃", response.getOutputStream());
         } catch (IOException e) {
             throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
         }
@@ -558,62 +635,84 @@
         try {
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 12; i++) {
+                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,8));
+            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,11));
             Row title = sheet.createRow(0);
-            title.setHeight((short) 1000);
+            title.setHeight((short) 800);
             Cell c = title.createCell(0);
             c.setCellValue(sheetName);
-            configFirstCell(sxssfWorkbook,c);
+            for (int i = 0; i < 12; i++) {
+//                title.createCell(i).setCellValue(i==0?sheetName:"");
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
             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(Constants.getChangeApplyTimeTitle(1,data));
+            header1.createCell(9).setCellValue(Constants.getChangeApplyTimeTitle(0,data));
+            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);
-            header2.createCell(0).setCellValue("鍔犱繚浜哄憳");
-            header2.createCell(6).setCellValue("鍑忎繚浜哄憳");
+            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));
             sheet.addMergedRegion(new CellRangeAddress(3  ,3,6,11));
             for (int i = 0; i < 12; i++) {
-                configFirstCell(sxssfWorkbook,header2.getCell(i));
+                configFirstCell(sxssfWorkbook,   header3.getCell(i));
             }
             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));
             }
@@ -626,18 +725,31 @@
                 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.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.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("");
+                    }
                 }
                 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.getIdcardNo(),""));
-                    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("");
+                    }
+                }
+                for (int i = 0; i < 12; i++) {
+                    configDataCell(sxssfWorkbook,   header5.getCell(i));
                 }
             }
             sxssfWorkbook.write(os);
@@ -660,67 +772,86 @@
      * @param data 鏁版嵁
      * @param sheetName Sheet鍚嶇О
      */
-    public String exportJiajianBaoExcelToPdf (ApplyChange data, String sheetName) {
+    public String exportJiajianBaoExcelToPdf (ApplyChange data, String sheetName,String cellValue) {
         SXSSFWorkbook sxssfWorkbook;
         try {
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 12; i++) {
+                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,8));
+            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,11));
             Row title = sheet.createRow(0);
-            title.setHeight((short) 1000);
+            title.setHeight((short) 800);
             Cell c = title.createCell(0);
             c.setCellValue(sheetName);
-            configFirstCell(sxssfWorkbook,c);
+            for (int i = 0; i < 12; i++) {
+//                title.createCell(i).setCellValue(i==0?sheetName:"");
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
             Row header1 = sheet.createRow(1);
-            header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
-            header1.createCell(3).setCellValue("淇濋櫓鏂规");
-            header1.createCell(4).setCellValue("淇濆崟鍙�");
-            header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+            header1.createCell(0).setCellValue(cellValue);
+            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.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));
+            }
             Row header3 = sheet.createRow(3);
-            header2.createCell(0).setCellValue("鍔犱繚浜哄憳");
-            header2.createCell(6).setCellValue("鍑忎繚浜哄憳");
+            header3.createCell(0).setCellValue("鍔犱繚浜哄憳");
+            header3.createCell(6).setCellValue("鍑忎繚浜哄憳");
             sheet.addMergedRegion(new CellRangeAddress(3  ,3,0,5));
             sheet.addMergedRegion(new CellRangeAddress(3  ,3,6,11));
             for (int i = 0; i < 12; i++) {
-                configFirstCell(sxssfWorkbook,header2.getCell(i));
+                configFirstCell(sxssfWorkbook,   header3.getCell(i));
             }
             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));
             }
@@ -733,45 +864,77 @@
                 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.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.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("");
+                    }
                 }
                 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.getIdcardNo(),""));
-                    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("");
+                    }
+                }
+                for (int i = 0; i < 12; i++) {
+                    configDataCell(sxssfWorkbook,   header5.getCell(i));
                 }
             }
-            int rowIndex = 4+data.getChangeDetailList().size();
-            Row header6= sheet.createRow(4+data.getChangeDetailList().size());
+            int rowIndex = 5+maxNum;
+            Row header6= sheet.createRow(rowIndex);
             header6.createCell(0).setCellValue("鎶曚繚浼佷笟鐢虫槑:\n" +
                     "1銆佸湪鐢宠涔︿笂濉啓鐨勪竴鍒囧唴瀹瑰睘瀹烇紝鍚﹀垯鏈紒涓氭壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
                     "2銆佺敱浜庡彉鏇村彈鐩婁汉浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
                     "3銆佹湰鐢宠琛ㄧ殑绛剧珷涓烘湰浼佷笟浜茶嚜绛剧讲锛屽鐢辨浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n");
-            configInfoCell(sxssfWorkbook,header6.getCell(0),HorizontalAlignment.LEFT);
-            sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,1,12));
+            for (int i = 1; i < 12; i++) {
+                header6.createCell(i).setCellValue("");
+            }
+            for (int i =0; i < 12; i++) {
+                if(i>0){
+                    header6.createCell(i).setCellValue("");
+                }
+                configInfoCell(sxssfWorkbook,header6.getCell(i),HorizontalAlignment.LEFT);
+            }
+            header6.setHeight((short) 2000);
+            sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,0,11));
             Row header7= sheet.createRow(rowIndex+1);
-            header7.createCell(0).setCellValue("鎶曚繚浼佷笟绛剧珷 锛�                            \n" +"鏃ユ湡锛�     骞�     鏈�     鏃�    ");
-            sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,1,12));
-            configInfoCell(sxssfWorkbook,header7.getCell(0),HorizontalAlignment.RIGHT);
+            header7.setHeight((short) 3000);
+            header7.createCell(0).setCellValue(cellValue+"绛剧珷 锛�                            \n \n \n" +"鏃ユ湡锛�     骞�     鏈�     鏃�    ");
+            for (int i =0; i < 12; i++) {
+                if(i>0){
+                    header7.createCell(i).setCellValue("");
+                }
+                configInfoCell(sxssfWorkbook,header7.getCell(i),HorizontalAlignment.RIGHT);
+            }
+            sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,11));
+
             //涓存椂缂撳啿鍖�
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             //鍒涘缓涓存椂鏂囦欢
             sxssfWorkbook.write(out);
             byte [] bookByteAry = out.toByteArray();
             InputStream     in = new ByteArrayInputStream(bookByteAry);
+            String tempExcel = saveIsToFile(in);
             String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
-            ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
+//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
+            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
             File f = new File(tempPdf);
-            if(f!=null && f.isFile()){
+            if(f!=null && f.isFile() && f.length()>0){
                 return tempPdf;
             }
         } catch (Exception e) {
+            e.printStackTrace();
             // throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
         }
         return null;
@@ -787,45 +950,59 @@
         try {
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 8; i++) {
+                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,8));
+            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,7));
             Row title = sheet.createRow(0);
             title.setHeight((short) 1000);
             Cell c = title.createCell(0);
             c.setCellValue(sheetName);
             configFirstCell(sxssfWorkbook,c);
+            for (int i = 0; i < 8; i++) {
+                if(i>0){
+                    title.createCell(i).setCellValue("");
+                }
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
             Row header1 = sheet.createRow(1);
             header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
-            header1.createCell(1).setCellValue("淇濋櫓鏂规");
+            header1.createCell(1).setCellValue("");
+            header1.createCell(2).setCellValue("淇濋櫓鏂规");
             header1.createCell(3).setCellValue("淇濆崟鍙�");
             header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
             header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
             header1.createCell(6).setCellValue("鎹㈠巶浜烘暟");
-            header1.createCell(7).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+            header1.createCell(7).setCellValue(Constants.getChangeApplyTimeTitle(2,data));
             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(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.getValidTime()));
-            sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,2));
-
+            header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
+            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));
             }
@@ -835,12 +1012,16 @@
                 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.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));
+                }
             }
             sxssfWorkbook.write(os);
             os.close();
@@ -856,26 +1037,39 @@
             }
         }
     }
+
+
+
     /**
      * 瀵煎嚭鍔犲噺淇濈敵璇疯鍗�
      * @param data 鏁版嵁
      * @param sheetName Sheet鍚嶇О
      */
-    public String exportChangeUnitExcelToPdf (ApplyChange data, String sheetName) {
+    public String exportChangeUnitExcelToPdf (ApplyChange data, String sheetName,String cellValue) {
         SXSSFWorkbook sxssfWorkbook;
         try {
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 8; i++) {
+                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,8));
+            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,7));
             Row title = sheet.createRow(0);
             title.setHeight((short) 1000);
             Cell c = title.createCell(0);
             c.setCellValue(sheetName);
             configFirstCell(sxssfWorkbook,c);
+            for (int i = 0; i < 8; i++) {
+                if(i>0){
+                    title.createCell(i).setCellValue("");
+                }
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
             Row header1 = sheet.createRow(1);
-            header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
-            header1.createCell(1).setCellValue("淇濋櫓鏂规");
+            header1.createCell(0).setCellValue(cellValue);
+            header1.createCell(1).setCellValue("");
+            header1.createCell(2).setCellValue("淇濋櫓鏂规");
             header1.createCell(3).setCellValue("淇濆崟鍙�");
             header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
             header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
@@ -884,27 +1078,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(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.getValidTime()));
-            sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,2));
-
+            header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
+            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));
             }
@@ -914,42 +1112,312 @@
                 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.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));
+                }
             }
             int rowIndex = 4+data.getChangeDetailList().size();
-            Row header6= sheet.createRow(4+data.getChangeDetailList().size());
+            Row header6= sheet.createRow(rowIndex);
             header6.createCell(0).setCellValue("鎶曚繚浼佷笟鐢虫槑:\n" +
                     "1銆佸湪鐢宠涔︿笂濉啓鐨勪竴鍒囧唴瀹瑰睘瀹烇紝鍚﹀垯鏈紒涓氭壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
                     "2銆佺敱浜庡彉鏇村彈鐩婁汉浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
                     "3銆佹湰鐢宠琛ㄧ殑绛剧珷涓烘湰浼佷笟浜茶嚜绛剧讲锛屽鐢辨浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n");
-            configInfoCell(sxssfWorkbook,header6.getCell(0),HorizontalAlignment.LEFT);
-            sheet.addMergedRegion(new CellRangeAddress(rowIndex ,rowIndex,1,8));
+            for (int i = 1; i < 8; i++) {
+                header6.createCell(i).setCellValue("");
+            }
+            for (int i =0; i < 8; 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));
             Row header7= sheet.createRow(rowIndex+1);
-            header7.createCell(0).setCellValue("鎶曚繚浼佷笟绛剧珷 锛�                            \n" +"鏃ユ湡锛�     骞�     鏈�     鏃�    ");
-            sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,1,8));
-            configInfoCell(sxssfWorkbook,header7.getCell(0),HorizontalAlignment.RIGHT);
+            header7.setHeight((short) 3000);
+            header7.createCell(0).setCellValue(cellValue + "绛剧珷 锛�                            \n \n \n" +"鏃ユ湡锛�     骞�     鏈�     鏃�    ");
+            for (int i =0; i < 8; 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));
+
             //涓存椂缂撳啿鍖�
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             //鍒涘缓涓存椂鏂囦欢
-             sxssfWorkbook.write(out);
+            sxssfWorkbook.write(out);
             byte [] bookByteAry = out.toByteArray();
             InputStream     in = new ByteArrayInputStream(bookByteAry);
+            String tempExcel = saveIsToFile(in);
             String tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
-            ExcelToPdfTool.excelToPdf(in,tempPdf);//杞琍DF
+//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
+            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
             File f = new File(tempPdf);
-            if(f!=null && f.isFile()){
+            if(f!=null && f.isFile() && f.length()>0){
                 return tempPdf;
             }
-            return tempPdf;
         } catch (Exception e) {
            // throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
         }
         return null;
+    }
+
+
+    /**
+     * 瀵煎嚭 鎶曚繚鐢宠璇﹀崟
+     * @param insuranceApply 鏁版嵁
+     * @param sheetName Sheet鍚嶇О
+     */
+    public String exportApplyExcelToPdf(InsuranceApply insuranceApply, String sheetName) {
+        SXSSFWorkbook sxssfWorkbook;
+        try {
+            sxssfWorkbook = new SXSSFWorkbook();
+            Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 6; i++) {
+                sheet.setColumnWidth(i, ((i==3|| i== 4|| i== 5 )?16:8) * 2 * 256);
+            }
+            sheet.createFreezePane(0, 1);
+            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,5));
+            Row title = sheet.createRow(0);
+            title.setHeight((short) 2000);
+            Cell c = title.createCell(0);
+            c.setCellValue(sheetName);
+            configFirstCell(sxssfWorkbook,c);
+            for (int i = 0; i < 6; i++) {
+                if(i>0){
+                    title.createCell(i).setCellValue("");
+                }
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
+            Row header1 = sheet.createRow(1);
+            header1.createCell(0).setCellValue("鎶曚繚浜�");
+            header1.createCell(1).setCellValue("");
+            header1.createCell(2).setCellValue("琚繚闄╀汉");
+            header1.createCell(3).setCellValue("");
+            header1.createCell(4).setCellValue("淇濋櫓鏂规");
+            header1.createCell(5).setCellValue("鐢宠鎻愪氦鏃ユ湡");
+//            header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
+            for (int i = 0; i < 6; i++) {
+                configFirstCell(sxssfWorkbook,header1.getCell(i));
+            }
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,2,3));
+
+            Row header2 = sheet.createRow(2);
+            header2.createCell(0).setCellValue(insuranceApply.getShopName());
+            header2.createCell(1).setCellValue("");
+            header2.createCell(2).setCellValue(insuranceApply.getCompanyName());
+            header2.createCell(3).setCellValue("");
+            header2.createCell(4).setCellValue(insuranceApply.getSolutionsName());
+            header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(insuranceApply.getCreateDate()));
+            sheet.addMergedRegion(new CellRangeAddress(2  ,2,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(2  ,2,2,3));
+            for (int i = 0; i < 6; 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(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));
+            }
+            // 鍒涘缓鏁版嵁璁板綍
+            for (int rowIndex = 0; rowIndex <insuranceApply.getApplyDetailList().size(); rowIndex++) {
+                ApplyDetail addModel = insuranceApply.getApplyDetailList().get(rowIndex);
+                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(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));
+                }
+            }
+            int rowIndex = 4+insuranceApply.getApplyDetailList().size();
+            Row header6= sheet.createRow(rowIndex);
+            header6.createCell(0).setCellValue("鎶曚繚浼佷笟鐢虫槑:\n" +
+                    "1銆佸湪鐢宠涔︿笂濉啓鐨勪竴鍒囧唴瀹瑰睘瀹烇紝鍚﹀垯鏈紒涓氭壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
+                    "2銆佺敱浜庡彉鏇村彈鐩婁汉浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
+                    "3銆佹湰鐢宠琛ㄧ殑绛剧珷涓烘湰浼佷笟浜茶嚜绛剧讲锛屽鐢辨浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n");
+            for (int i = 1; i < 6; i++) {
+                header6.createCell(i).setCellValue("");
+            }
+            for (int i =0; i < 6; 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,5));
+            Row header7= sheet.createRow(rowIndex+1);
+            header7.setHeight((short) 3000);
+            header7.createCell(0).setCellValue("琚繚闄╀汉绛剧珷 锛�                            \n \n \n" +"鏃ユ湡锛�     骞�     鏈�     鏃�    ");
+            for (int i =0; i < 6; i++) {
+                if(i>0){
+                    header7.createCell(i).setCellValue("");
+                }
+                configInfoCell(sxssfWorkbook,header7.getCell(i),HorizontalAlignment.RIGHT);
+            }
+            sheet.addMergedRegion(new CellRangeAddress(rowIndex+1 ,rowIndex+1,0,5));
+
+            //涓存椂缂撳啿鍖�
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            //鍒涘缓涓存椂鏂囦欢
+            sxssfWorkbook.write(out);
+            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";
+//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
+            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
+            File f = new File(tempPdf);
+            if(f!=null && f.isFile() && f.length()>0){
+                return tempPdf;
+            }
+        } catch (Exception e) {
+            // throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        }
+        return null;
+    }
+
+    private String saveIsToFile(InputStream inputStream) {
+            try {
+                String fileName =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".xlsx";
+                File file = new File(fileName); // 鎸囧畾淇濆瓨鍒版湰鍦扮殑鏂囦欢鍚嶅強璺緞
+                file.createNewFile();
+                OutputStream outputStream = new FileOutputStream(file);
+                byte[] buffer = new byte[1024];
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                }
+
+                outputStream.close();
+                inputStream.close();
+                return fileName;
+            }catch (Exception e){
+
+            }
+            return null;
+    }
+
+    public void exportUnionApplyDetail(UnionApply model, HttpServletResponse response) {
+        try {
+            String encodeFileName = URLEncoder.encode("鎶曚繚璇︽儏鍗昣"+model.getCompanyName()+"_"+model.getSolutionName(), Charset.forName("UTF-8").toString()) + ".xlsx";
+            response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+            response.setContentType("application/octet-stream");
+            response.setHeader("eva-opera-type", "download");
+            response.setHeader("eva-download-filename", encodeFileName);
+            this.exportUnionApplyDetailDo(model,"鎶曚繚鐢宠琛�", response.getOutputStream());
+        } catch (IOException e) {
+            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        }
+    }
+
+
+    public void exportUnionApplyDetailDo (UnionApply data, String sheetName, OutputStream os) {
+        SXSSFWorkbook sxssfWorkbook;
+        try {
+            sxssfWorkbook = new SXSSFWorkbook();
+            Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i <7; i++) {
+                sheet.setColumnWidth(i, (i==5?20:15) * 2 * 256);
+            }
+            sheet.createFreezePane(0, 1);
+            Row title = sheet.createRow(0);
+            title.setHeight((short) 800);
+            for (int i = 0; i < 7; i++) {
+                title.createCell(i).setCellValue(i==0?sheetName:"");
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
+            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,6));
+            Row header1 = sheet.createRow(1);
+            header1.setHeight((short) 500);
+            header1.createCell(0).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("鎬昏垂鐢紙鍏冿級");
+            for (int i = 0; i < 7; i++) {
+                configFirstCell(sxssfWorkbook,header1.getCell(i));
+            }
+            Row header2 = sheet.createRow(2);
+            header2.createCell(0).setCellValue(data.getCompanyName());
+            header2.createCell(1).setCellValue(data.getCompanyNames());
+            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.getGuaranteeNum()+" / "+data.getInsureNum());
+            header2.createCell(6).setCellValue(Constants.formatBigdecimal2Float(data.getFee()).toString());
+            for (int i = 0; i < 7; 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(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));
+            }
+            if(data.getApplyDetailList()!=null){
+                // 鍒涘缓鏁版嵁璁板綍
+                for (int rowIndex = 0; rowIndex < data.getApplyDetailList().size(); rowIndex++) {
+                    ApplyDetail d = data.getApplyDetailList().get(rowIndex);
+                    Row header5 = sheet.createRow(rowIndex + 4);
+//                    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(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));
+                    }
+                }
+            }
+            sxssfWorkbook.write(os);
+            os.close();
+        } catch (Exception e) {
+            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
     }
 
 
@@ -962,4 +1430,883 @@
         private Field field;
     }
 
+
+
+    /**
+     * 瀵煎嚭 鍚堝苟鍗� 鎹㈠巶 鐢宠璇﹀崟
+     * @param data 鏁版嵁
+     * @param sheetName Sheet鍚嶇О
+     */
+    public String exportUnionChangeOtherUnitExcelToPdf (UnionChange data, String sheetName) {
+        SXSSFWorkbook sxssfWorkbook;
+        try {
+            sxssfWorkbook = new SXSSFWorkbook();
+            Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 9; i++) {
+                sheet.setColumnWidth(i, ((i==3|| i== 4|| i== 5 ||i== 6 || i==7|| i==8 || i==9)?16:8) * 2 * 256);
+            }
+            sheet.createFreezePane(0, 1);
+            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,8));
+            Row title = sheet.createRow(0);
+            title.setHeight((short) 1000);
+            Cell c = title.createCell(0);
+            c.setCellValue(sheetName);
+            configFirstCell(sxssfWorkbook,c);
+            for (int i = 0; i < 9; i++) {
+                if(i>0){
+                    title.createCell(i).setCellValue("");
+                }
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
+            Row header1 = sheet.createRow(1);
+            header1.createCell(0).setCellValue("鎶曚繚浜�");
+            header1.createCell(1).setCellValue("");
+            header1.createCell(2).setCellValue("淇濋櫓鏂规");
+            header1.createCell(3).setCellValue("");
+            header1.createCell(4).setCellValue("淇濆崟鍙�");
+            header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+            header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
+            header1.createCell(7).setCellValue("鎹㈠巶浜烘暟");
+            header1.createCell(8).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,2,3));
+
+            for (int i = 0; i < 9; i++) {
+                configFirstCell(sxssfWorkbook,header1.getCell(i));
+            }
+            Row header2 = sheet.createRow(2);
+            header2.createCell(0).setCellValue(data.getShopName());
+            header2.createCell(1).setCellValue("");
+            header2.createCell(2).setCellValue(data.getSolutionsName());
+            header2.createCell(3).setCellValue("");
+            header2.createCell(4).setCellValue(data.getApplyCode());
+            header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+            header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
+            header2.createCell(7).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.TWO)).collect(Collectors.toList()).size());
+            header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
+//            sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,3));
+
+            sheet.addMergedRegion(new CellRangeAddress(2  ,2,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(2  ,2,2,3));
+            for (int i = 0; i < 9; i++) {
+                configDataCell(sxssfWorkbook,header2.getCell(i));
+            }
+            Row header3 = sheet.createRow(3);
+            header3.createCell(0).setCellValue("琚繚闄╀汉");
+            header3.createCell(1).setCellValue("");
+            header3.createCell(2).setCellValue(data.getCompanyNames());
+            header3.createCell(3).setCellValue("");
+            header3.createCell(4).setCellValue("");
+            header3.createCell(5).setCellValue("");
+            header3.createCell(6).setCellValue("");
+            header3.createCell(7).setCellValue("");
+            header3.createCell(8).setCellValue("");
+            for (int i = 0; i < 2; i++) {
+                configFirstCell(sxssfWorkbook,header3.getCell(i));
+            }
+            for (int i = 2; i < 9; i++) {
+                configDataCell(sxssfWorkbook,header3.getCell(i));
+            }
+            sheet.addMergedRegion(new CellRangeAddress(3  ,3,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(3  ,3,2,8));
+
+
+            List<ApplyChagneDetail> otherChangeDetailList = data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.TWO)).collect(Collectors.toList());
+
+            Integer row = 3;
+
+            if(CollectionUtils.isNotEmpty(otherChangeDetailList)){
+                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("鏇存敼鍚庢墍灞炲伐绉�");
+                header5.createCell(8).setCellValue("澶囨敞");
+                for (int i = 0; i < 9; i++) {
+                    configFirstCell(sxssfWorkbook,header5.getCell(i));
+                }
+                for (int rowIndex = 0; rowIndex < otherChangeDetailList.size(); rowIndex++) {
+                    row = row + 1;
+                    Row header6 = sheet.createRow(row);
+                    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(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));
+                    }
+                }
+            }
+            int rowIndex =  row + 1 ;
+            Row header6= sheet.createRow(rowIndex);
+            header6.createCell(0).setCellValue("鎶曚繚浼佷笟鐢虫槑:\n" +
+                    "1銆佸湪鐢宠涔︿笂濉啓鐨勪竴鍒囧唴瀹瑰睘瀹烇紝鍚﹀垯鏈紒涓氭壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
+                    "2銆佺敱浜庡彉鏇村彈鐩婁汉浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
+                    "3銆佹湰鐢宠琛ㄧ殑绛剧珷涓烘湰浼佷笟浜茶嚜绛剧讲锛屽鐢辨浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n");
+            for (int i = 1; i < 9; i++) {
+                header6.createCell(i).setCellValue("");
+            }
+            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,8));
+            Row header7= sheet.createRow(rowIndex+1);
+            header7.setHeight((short) 3000);
+            header7.createCell(0).setCellValue("鎶曚繚浜虹绔� 锛�                            \n \n \n" +"鏃ユ湡锛�     骞�     鏈�     鏃�    ");
+            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,8));
+
+            //涓存椂缂撳啿鍖�
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            //鍒涘缓涓存椂鏂囦欢
+            sxssfWorkbook.write(out);
+            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";
+//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
+            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
+            File f = new File(tempPdf);
+            if(f!=null && f.isFile() && f.length()>0){
+                return tempPdf;
+            }
+        } catch (Exception e) {
+            // throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        }
+        return null;
+    }
+
+
+
+    /**
+     * 瀵煎嚭 鍚堝苟鍗曞姞鍑忎繚鐢宠璇﹀崟
+     * @param data 鏁版嵁
+     * @param sheetName Sheet鍚嶇О
+     */
+    public String exportUnionChangeExcelToPdf (UnionChange data, String sheetName) {
+        SXSSFWorkbook sxssfWorkbook;
+        try {
+            sxssfWorkbook = new SXSSFWorkbook();
+            Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            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,8));
+            Row title = sheet.createRow(0);
+            title.setHeight((short) 2000);
+            for (int i = 0; i < 9; i++) {
+                title.createCell(i).setCellValue(i==0?sheetName:"");
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
+            Row header1 = sheet.createRow(1);
+            header1.createCell(0).setCellValue("鎶曚繚浜�");
+            header1.createCell(1).setCellValue("淇濋櫓鏂规");
+            header1.createCell(2).setCellValue("淇濆崟鍙�");
+            header1.createCell(3).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+            header1.createCell(4).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
+            header1.createCell(5).setCellValue("鍔犱繚浜烘暟");
+            header1.createCell(6).setCellValue("鍑忎繚浜烘暟");
+            header1.createCell(7).setCellValue("鎵瑰鐢熸晥鏃ユ湡");
+            header1.createCell(8).setCellValue("鎵瑰噺鐢熸晥鏃ユ湡");
+            for (int i = 0; i < 9; i++) {
+                configFirstCell(sxssfWorkbook,header1.getCell(i));
+            }
+
+            Row header2 = sheet.createRow(2);
+            header2.createCell(0).setCellValue(data.getShopName());
+            header2.createCell(1).setCellValue(data.getSolutionsName());
+            header2.createCell(2).setCellValue(data.getApplyCode());
+            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.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()));
+            header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
+            for (int i = 0; i < 9; i++) {
+                configDataCell(sxssfWorkbook,   header2.getCell(i));
+            }
+
+            Row header3 = sheet.createRow(3);
+            header3.createCell(0).setCellValue("琚繚闄╀汉");
+            header3.createCell(1).setCellValue(data.getCompanyNames());
+            header3.createCell(2).setCellValue("");
+            header3.createCell(3).setCellValue("");
+            header3.createCell(4).setCellValue("");
+            header3.createCell(5).setCellValue("");
+            header3.createCell(6).setCellValue("");
+            header3.createCell(7).setCellValue("");
+            header3.createCell(8).setCellValue("");
+            for (int i = 0; i < 9; i++) {
+                configFirstCell(sxssfWorkbook,header3.getCell(i));
+            }
+            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,8));
+                row = row + 1;
+                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("澶囨敞");
+                for (int i = 0; i < 9; i++) {
+                    configFirstCell(sxssfWorkbook,header5.getCell(i));
+                }
+                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(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,5,6));
+                }
+            }
+
+            List<ApplyChagneDetail> reduceChangeDetailList = data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList());
+            row = row + 1;
+            if(CollectionUtils.isNotEmpty(reduceChangeDetailList)){
+                Row header4 = sheet.createRow(row);
+                header4.createCell(0).setCellValue("鍑忎繚浜哄憳");
+                for (int i = 0; i < 9; i++) {
+                    configFirstCell(sxssfWorkbook,   header4.getCell(i));
+                }
+                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(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,5,6));
+
+                row = row + 1 ;
+                for (int rowIndex = 0; rowIndex < reduceChangeDetailList.size(); 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(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,5,6));
+                    row = row +  1;
+                }
+            }
+
+            int rowIndex = row + 1;
+            Row header6= sheet.createRow(rowIndex);
+            header6.createCell(0).setCellValue("鎶曚繚浼佷笟鐢虫槑:\n" +
+                    "1銆佸湪鐢宠涔︿笂濉啓鐨勪竴鍒囧唴瀹瑰睘瀹烇紝鍚﹀垯鏈紒涓氭壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
+                    "2銆佺敱浜庡彉鏇村彈鐩婁汉浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n" +
+                    "3銆佹湰鐢宠琛ㄧ殑绛剧珷涓烘湰浼佷笟浜茶嚜绛剧讲锛屽鐢辨浜х敓鐨勬硶寰嬬籂绾锋湰浼佷笟鎰挎壙鎷呬竴鍒囨硶寰嬭矗浠汇�俓n");
+            for (int i = 1; i < 9; i++) {
+                header6.createCell(i).setCellValue("");
+            }
+            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,8));
+            Row header7= sheet.createRow(rowIndex+1);
+            header7.setHeight((short) 3000);
+            header7.createCell(0).setCellValue("鎶曚繚浜虹绔� 锛�                            \n \n \n" +"鏃ユ湡锛�     骞�     鏈�     鏃�    ");
+            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,8));
+
+            //涓存椂缂撳啿鍖�
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            //鍒涘缓涓存椂鏂囦欢
+            sxssfWorkbook.write(out);
+            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"; //"d:/1.docx";
+//            ExcelToPdfToolNew.excelToPdf(in,tempPdf);//杞琍DF
+            ExcelToPdfToolNew.excelToPdf(tempExcel,tempPdf);//杞琍DF
+            File f = new File(tempPdf);
+            if(f!=null && f.isFile() && f.length()>0){
+                return tempPdf;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            // throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        }
+        return null;
+    }
+
+
+
+
+    public void exportUnionChangeDetail(UnionChange model, HttpServletResponse response) {
+        try {
+            String fileName = "鍔犲噺淇濊鎯呭崟";
+            if(model.getType().equals(Constants.ONE)){
+                fileName = "鏇存崲娲鹃仯鍗曚綅璇︽儏鍗�";
+            }
+            String encodeFileName = URLEncoder.encode(fileName +"_"+model.getShopName(), Charset.forName("UTF-8").toString()) + ".xlsx";
+            response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+            response.setContentType("application/octet-stream");
+            response.setHeader("eva-opera-type", "download");
+            response.setHeader("eva-download-filename", encodeFileName);
+            if(model.getType().equals(Constants.ZERO)){
+                this.exportUnionChangeAddDetailDo(model,"鍔犲噺淇濈敵璇疯〃", response.getOutputStream());
+            }else{
+                this.exportUnionChangeDuDetailDo(model,"鏇存崲娲鹃仯鍗曚綅鐢宠琛�", response.getOutputStream());
+            }
+
+        } catch (IOException e) {
+            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        }
+    }
+
+    public void exportUnionChangeAddDetailDo (UnionChange data, String sheetName, OutputStream os) {
+        SXSSFWorkbook sxssfWorkbook;
+        try {
+            sxssfWorkbook = new SXSSFWorkbook();
+            Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            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,8));
+            Row title = sheet.createRow(0);
+            title.setHeight((short) 2000);
+            for (int i = 0; i < 9; i++) {
+                title.createCell(i).setCellValue(i==0?sheetName:"");
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
+            Row header1 = sheet.createRow(1);
+            header1.createCell(0).setCellValue("鎶曚繚浜�");
+            header1.createCell(1).setCellValue("淇濋櫓鏂规");
+            header1.createCell(2).setCellValue("淇濆崟鍙�");
+            header1.createCell(3).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+            header1.createCell(4).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
+            header1.createCell(5).setCellValue("鍔犱繚浜烘暟");
+            header1.createCell(6).setCellValue("鍑忎繚浜烘暟");
+            header1.createCell(7).setCellValue(Constants.getChangeApplyTimeTitle(1,data));
+            header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(0,data));
+            for (int i = 0; i < 9; i++) {
+                configFirstCell(sxssfWorkbook,header1.getCell(i));
+            }
+
+            Row header2 = sheet.createRow(2);
+            header2.createCell(0).setCellValue(data.getShopName());
+            header2.createCell(1).setCellValue(data.getSolutionsName());
+            header2.createCell(2).setCellValue(data.getApplyCode());
+            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.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()));
+            header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
+            for (int i = 0; i < 9; i++) {
+                configDataCell(sxssfWorkbook,   header2.getCell(i));
+            }
+
+            Row header3 = sheet.createRow(3);
+            header3.createCell(0).setCellValue("琚繚闄╀汉");
+            header3.createCell(1).setCellValue(data.getCompanyNames());
+            header3.createCell(2).setCellValue("");
+            header3.createCell(3).setCellValue("");
+            header3.createCell(4).setCellValue("");
+            header3.createCell(5).setCellValue("");
+            header3.createCell(6).setCellValue("");
+            header3.createCell(7).setCellValue("");
+            header3.createCell(8).setCellValue("");
+            for (int i = 0; i < 9; i++) {
+                configFirstCell(sxssfWorkbook,header3.getCell(i));
+            }
+            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)){
+                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,8));
+                row = row + 1;
+                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("澶囨敞");
+                for (int i = 0; i < 9; i++) {
+                    configFirstCell(sxssfWorkbook,header5.getCell(i));
+                }
+                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(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,5,6));
+                }
+            }
+
+            List<ApplyChagneDetail> reduceChangeDetailList = data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList());
+            row = row + 1;
+            if(CollectionUtils.isNotEmpty(reduceChangeDetailList)){
+                Row header4 = sheet.createRow(row);
+                header4.createCell(0).setCellValue("鍑忎繚浜哄憳");
+                for (int i = 0; i < 9; i++) {
+                    configFirstCell(sxssfWorkbook,   header4.getCell(i));
+                }
+                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(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,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(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,5,6));
+                }
+            }
+            sxssfWorkbook.write(os);
+            os.close();
+        } catch (Exception e) {
+            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+
+    public void exportUnionChangeDuDetailDo (UnionChange data, String sheetName, OutputStream os) {
+        SXSSFWorkbook sxssfWorkbook;
+        try {
+            sxssfWorkbook = new SXSSFWorkbook();
+            Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 9; i++) {
+                sheet.setColumnWidth(i, ((i==3|| i== 4|| i== 5 ||i== 6 || i==7|| i==8 || i==9)?16:8) * 2 * 256);
+            }
+            sheet.createFreezePane(0, 1);
+            sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,8));
+            Row title = sheet.createRow(0);
+            title.setHeight((short) 1000);
+            Cell c = title.createCell(0);
+            c.setCellValue(sheetName);
+            configFirstCell(sxssfWorkbook,c);
+            for (int i = 0; i < 9; i++) {
+                if(i>0){
+                    title.createCell(i).setCellValue("");
+                }
+                configTitleCell(sxssfWorkbook,title.getCell(i));
+            }
+            Row header1 = sheet.createRow(1);
+            header1.createCell(0).setCellValue("鎶曚繚浜�");
+            header1.createCell(1).setCellValue("");
+            header1.createCell(2).setCellValue("淇濋櫓鏂规");
+            header1.createCell(3).setCellValue("");
+            header1.createCell(4).setCellValue("淇濆崟鍙�");
+            header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+            header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
+            header1.createCell(7).setCellValue("鎹㈠巶浜烘暟");
+            header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(2,data));
+
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,2,3));
+
+            for (int i = 0; i < 9; i++) {
+                configFirstCell(sxssfWorkbook,header1.getCell(i));
+            }
+            Row header2 = sheet.createRow(2);
+            header2.createCell(0).setCellValue(data.getShopName());
+            header2.createCell(1).setCellValue("");
+            header2.createCell(2).setCellValue(data.getSolutionsName());
+            header2.createCell(3).setCellValue("");
+            header2.createCell(4).setCellValue(data.getApplyCode());
+            header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+            header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
+            header2.createCell(7).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.TWO)).collect(Collectors.toList()).size());
+            header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
+//            sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,3));
+
+            sheet.addMergedRegion(new CellRangeAddress(2  ,2,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(2  ,2,2,3));
+            for (int i = 0; i < 9; i++) {
+                configDataCell(sxssfWorkbook,header2.getCell(i));
+            }
+            Row header3 = sheet.createRow(3);
+            header3.createCell(0).setCellValue("琚繚闄╀汉");
+            header3.createCell(1).setCellValue("");
+            header3.createCell(2).setCellValue(data.getCompanyNames());
+            header3.createCell(3).setCellValue("");
+            header3.createCell(4).setCellValue("");
+            header3.createCell(5).setCellValue("");
+            header3.createCell(6).setCellValue("");
+            header3.createCell(7).setCellValue("");
+            header3.createCell(8).setCellValue("");
+            for (int i = 0; i < 2; i++) {
+                configFirstCell(sxssfWorkbook,header3.getCell(i));
+            }
+            for (int i = 2; i < 9; i++) {
+                configDataCell(sxssfWorkbook,header3.getCell(i));
+            }
+            sheet.addMergedRegion(new CellRangeAddress(3  ,3,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(3  ,3,2,8));
+
+
+            List<ApplyChagneDetail> otherChangeDetailList = data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.TWO)).collect(Collectors.toList());
+
+            Integer row = 3;
+
+            if(CollectionUtils.isNotEmpty(otherChangeDetailList)){
+                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("鏇存敼鍚庢墍灞炲伐绉�");
+                header5.createCell(8).setCellValue("澶囨敞");
+                for (int i = 0; i < 9; i++) {
+                    configFirstCell(sxssfWorkbook,header5.getCell(i));
+                }
+                for (int rowIndex = 0; rowIndex < otherChangeDetailList.size(); rowIndex++) {
+                    row = row + 1;
+                    Row header6 = sheet.createRow(row);
+                    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(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));
+                    }
+                }
+            }
+
+            sxssfWorkbook.write(os);
+            os.close();
+        } catch (Exception e) {
+            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public void exportApplyJiajianBaoExcel(InsuranceApply insuranceApply,List<ApplyChange> applyChangeList, HttpServletResponse response) {
+        try {
+            String encodeFileName = URLEncoder.encode(insuranceApply.getCode(), Charset.forName("UTF-8").toString()) + ".xlsx";
+            response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+            response.setContentType("application/octet-stream");
+            response.setHeader("eva-opera-type", "download");
+            response.setHeader("eva-download-filename", encodeFileName);
+            this.exportApplyJiajianBaoExcelDo(applyChangeList, response.getOutputStream());
+        } catch (IOException e) {
+            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        }
+    }
+
+
+    public String getSheetName(List<String> nameList ,String sheetName){
+        if(CollectionUtils.isEmpty(nameList)){
+            return sheetName;
+        }
+        Integer count = nameList.stream().filter(i->i.equals(sheetName)).collect(Collectors.toList()).size();
+        if(count>Constants.ZERO){
+            return sheetName + "("+(count)+")";
+        }else{
+            return sheetName;
+        }
+
+    }
+
+
+    /**
+     * 瀵煎嚭淇濆崟涓� 鍔犲噺淇濈敵璇疯鍗�
+     * @param applyChangeList 鏁版嵁
+     * @param sheetName Sheet鍚嶇О
+     * @param os 杈撳嚭娴�
+     */
+    public void exportApplyJiajianBaoExcelDo (List<ApplyChange> applyChangeList, OutputStream os) {
+        SXSSFWorkbook sxssfWorkbook;
+        try {
+            sxssfWorkbook = new SXSSFWorkbook();
+            List<String> nameList = new ArrayList<>();
+            for (int x = 0; x < applyChangeList.size(); x++) {
+
+                ApplyChange data = applyChangeList.get(x);
+                Sheet sheet = sxssfWorkbook.createSheet(getSheetName(nameList,com.doumee.core.utils.DateUtil.getDate(data.getCreateDate(),"yyyy-MM-dd")));
+                for (int i = 0; i < 13; i++) {
+                    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,12));
+                Row title = sheet.createRow(0);
+                title.setHeight((short) 800);
+                Cell c = title.createCell(0);
+                c.setCellValue("鍔犲噺淇濊褰�");
+                nameList.add(com.doumee.core.utils.DateUtil.getDate(data.getCreateDate(),"yyyy-MM-dd"));
+                for (int i = 0; i < 13; i++) {
+//                title.createCell(i).setCellValue(i==0?sheetName:"");
+                    configTitleCell(sxssfWorkbook,title.getCell(i));
+                }
+                Row header1 = sheet.createRow(1);
+                header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
+                header1.createCell(1).setCellValue("");
+                header1.createCell(2).setCellValue("淇濋櫓鏂规");
+                header1.createCell(3).setCellValue("淇濆崟鍙�");
+                header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+                header1.createCell(5).setCellValue("");
+                header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
+                header1.createCell(7).setCellValue("");
+                header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(1,data));
+                header1.createCell(9).setCellValue(Constants.getChangeApplyTimeTitle(0,data));
+                header1.createCell(10).setCellValue("鍔犱繚浜烘暟");
+                header1.createCell(11).setCellValue("鍑忎繚浜烘暟");
+                header1.createCell(12).setCellValue("鎵规敼閲戦");
+                for (int i = 0; i < 13; i++) {
+                    configFirstCell(sxssfWorkbook,header1.getCell(i));
+                }
+                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(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(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());
+                header2.createCell(12).setCellValue(data.getFee()+"鍏�");
+                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 < 13; i++) {
+                    configDataCell(sxssfWorkbook,   header2.getCell(i));
+                }
+                Row header3 = sheet.createRow(3);
+                for (int i = 0; i < 13; i++) {
+                    header3.createCell(i).setCellValue("");
+                }
+                header3.createCell(0).setCellValue("鍔犱繚浜哄憳");
+                header3.createCell(6).setCellValue("鍑忎繚浜哄憳");
+                sheet.addMergedRegion(new CellRangeAddress(3  ,3,0,5));
+                sheet.addMergedRegion(new CellRangeAddress(3  ,3,6,12));
+                for (int i = 0; i < 13; i++) {
+                    configFirstCell(sxssfWorkbook,   header3.getCell(i));
+                }
+                Row header4 = sheet.createRow(4);
+                header4.createCell(0).setCellValue("搴忓彿");
+                header4.createCell(1).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(8).setCellValue("韬唤璇佸彿");
+                header4.createCell(9).setCellValue("娲鹃仯鍗曚綅");
+                header4.createCell(10).setCellValue("鎵�灞炲伐绉�");
+                header4.createCell(11).setCellValue("澶囨敞");
+                header4.createCell(12).setCellValue("");
+                sheet.addMergedRegion(new CellRangeAddress(4  ,4,11,12));
+                for (int i = 0; i < 13; i++) {
+                    configFirstCell(sxssfWorkbook,header4.getCell(i));
+                }
+                int maxNum = data.getAddNum()>data.getDelNum()?data.getAddNum():data.getDelNum();
+                // 鍒涘缓鏁版嵁璁板綍
+                for (int rowIndex = 0; rowIndex <maxNum; rowIndex++) {
+                    ApplyChagneDetail addModel =  data.getAddDetailList().size()> rowIndex?data.getAddDetailList().get(rowIndex):null;
+                    ApplyChagneDetail delModel =  data.getDelDetailList().size()> rowIndex?data.getDelDetailList().get(rowIndex):null;
+                    Row header5 = sheet.createRow(rowIndex + 5);
+                    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(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("");
+                        }
+                    }
+                    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(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(),""));
+                        header5.createCell(12).setCellValue("");
+                        sheet.addMergedRegion(new CellRangeAddress(rowIndex + 5  ,rowIndex + 5,11,12));
+                    }else{
+                        for (int i =6; i < 13; i++) {
+                            header5.createCell(i).setCellValue("");
+                        }
+                    }
+                    for (int i = 0; i < 13; i++) {
+                        configDataCell(sxssfWorkbook,   header5.getCell(i));
+                    }
+                }
+            }
+            sxssfWorkbook.write(os);
+            os.close();
+        } catch (Exception e) {
+            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+
+
 }

--
Gitblit v1.9.3