From a68bf12a2975405f57f9a9d51b91c13a93c026f0 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 31 一月 2024 21:01:36 +0800
Subject: [PATCH] Mr.Shi

---
 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java |  218 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 171 insertions(+), 47 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 3526bbe..4ddccfc 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
@@ -256,6 +256,9 @@
      * 閰嶇疆鏁版嵁鍗曞厓鏍�
      */
     private void configDataCell (SXSSFWorkbook workbook, Cell cell ) {
+        if(cell == null){
+            return;
+        }
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -274,6 +277,9 @@
      * 閰嶇疆鏁版嵁鍗曞厓鏍�
      */
     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);
@@ -300,6 +306,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);
@@ -322,6 +331,9 @@
      * 閰嶇疆鍒楀ご鍗曞厓鏍�
      */
     private void configFirstCell (SXSSFWorkbook workbook, Cell cell ) {
+        if(cell == null){
+            return;
+        }
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -338,6 +350,9 @@
         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);
@@ -357,6 +372,9 @@
      * 閰嶇疆鍒楀ご鍗曞厓鏍�
      */
     private void configInfoCell (SXSSFWorkbook workbook, Cell cell,HorizontalAlignment p ) {
+        if(cell == null){
+            return;
+        }
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(p);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -368,6 +386,7 @@
         font.setFontHeightInPoints((short)12);
         font.setBold(true);
         style.setFont(font);
+        style.setWrapText(true);
         // 璁剧疆杈规
         configCellBorder(style);
         cell.setCellStyle(style);
@@ -376,6 +395,9 @@
      * 閰嶇疆鍒楀ご鍗曞厓鏍�
      */
     private void configEndCell (SXSSFWorkbook workbook, Cell cell ) {
+        if(cell == null){
+            return;
+        }
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(HorizontalAlignment.RIGHT);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -585,7 +607,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);
         }
@@ -602,13 +624,19 @@
         try {
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 12; i++) {
+                sheet.setColumnWidth(i, ((i==3|| i== 5 || i==9|| i==11)?16:8) * 2 * 256);
+            }
             sheet.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("淇濋櫓鏂规");
@@ -624,7 +652,6 @@
             sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,2));
             sheet.addMergedRegion(new CellRangeAddress(1  ,1,6,8));
 
-
             Row header2 = sheet.createRow(2);
             header2.createCell(0).setCellValue(data.getCompanyName());
             header2.createCell(3).setCellValue(data.getSolutionsName());
@@ -636,14 +663,16 @@
             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));
-            //绌虹櫧琛�
+            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("搴忓彿");
@@ -671,17 +700,28 @@
                     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(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
                     header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
                     header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+                }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(9).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
                     header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
                     header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+                }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);
@@ -709,13 +749,17 @@
         try {
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 12; i++) {
+                sheet.setColumnWidth(i, ((i==3|| i==4|| i== 5 || i==9||i==10||  i==11)?16:8) * 2 * 256);
+            }
             sheet.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);
-            Cell c = title.createCell(0);
-            c.setCellValue(sheetName);
-            configFirstCell(sxssfWorkbook,c);
+            title.setHeight((short) 2000);
+            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("淇濋櫓鏂规");
@@ -731,26 +775,31 @@
             sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,2));
             sheet.addMergedRegion(new CellRangeAddress(1  ,1,6,8));
 
-
             Row header2 = sheet.createRow(2);
             header2.createCell(0).setCellValue(data.getCompanyName());
+            header2.createCell(1).setCellValue("");
+            header2.createCell(2).setCellValue("");
             header2.createCell(3).setCellValue(data.getSolutionsName());
             header2.createCell(4).setCellValue(data.getApplyCode());
             header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
             header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
+            header2.createCell(7).setCellValue("");
+            header2.createCell(8).setCellValue("");
             header2.createCell(9).setCellValue(data.getAddNum());
             header2.createCell(10).setCellValue(data.getDelNum());
             header2.createCell(11).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
             sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,2));
             sheet.addMergedRegion(new CellRangeAddress(2  ,2,6,8));
-            //绌虹櫧琛�
+            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("搴忓彿");
@@ -778,31 +827,58 @@
                     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(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
                     header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
                     header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+                }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(9).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
                     header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
                     header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+                }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("鎶曚繚浼佷笟绛剧珷 锛�                            \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();
             //鍒涘缓涓存椂鏂囦欢
@@ -816,6 +892,7 @@
                 return tempPdf;
             }
         } catch (Exception e) {
+            e.printStackTrace();
             // throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
         }
         return null;
@@ -831,16 +908,26 @@
         try {
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 8; i++) {
+                sheet.setColumnWidth(i, ((i==3|| i== 5 || i==7)?16:8) * 2 * 256);
+            }
             sheet.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(2).setCellValue("");
             header1.createCell(3).setCellValue("淇濆崟鍙�");
             header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
             header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
@@ -854,13 +941,16 @@
             Row header2 = sheet.createRow(2);
             header2.createCell(0).setCellValue(data.getCompanyName());
             header2.createCell(1).setCellValue(data.getSolutionsName());
+            header2.createCell(2).setCellValue("");
             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()));
+            header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
             sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,2));
-
+            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("鍛樺伐濮撳悕");
@@ -880,11 +970,14 @@
                 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(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
                 header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
                 header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
                 header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
                 header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+                for (int i = 0; i < 8; i++) {
+                    configDataCell(sxssfWorkbook,header5.getCell(i));
+                }
             }
             sxssfWorkbook.write(os);
             os.close();
@@ -910,16 +1003,26 @@
         try {
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
+            for (int i = 0; i < 8; i++) {
+                sheet.setColumnWidth(i, ((i==3|| i== 4|| i== 5 ||i== 6 || i==7)?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);
+            title.setHeight((short) 2000);
             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(2).setCellValue("");
             header1.createCell(3).setCellValue("淇濆崟鍙�");
             header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
             header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
@@ -933,13 +1036,16 @@
             Row header2 = sheet.createRow(2);
             header2.createCell(0).setCellValue(data.getCompanyName());
             header2.createCell(1).setCellValue(data.getSolutionsName());
+            header2.createCell(2).setCellValue("");
             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()));
+            header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
             sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,2));
-
+            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("鍛樺伐濮撳悕");
@@ -959,28 +1065,47 @@
                 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(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
                 header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
                 header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
                 header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
                 header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+                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("鎶曚繚浼佷笟绛剧珷 锛�                            \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 tempPdf =System.getProperty("java.io.tmpdir")+File.separator+UUID.randomUUID().toString()+".pdf";
@@ -989,7 +1114,6 @@
             if(f!=null && f.isFile()){
                 return tempPdf;
             }
-            return tempPdf;
         } catch (Exception e) {
            // throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
         }

--
Gitblit v1.9.3