From 4578947705e32036537016de952d2f24aa6fb5f2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 08:56:59 +0800
Subject: [PATCH] 提交一把

---
 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java |  493 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 272 insertions(+), 221 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 26c8c4c..1729e96 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
@@ -536,10 +536,11 @@
             Row header4 = sheet.createRow(3);
             header4.createCell(0).setCellValue("搴忓彿");
             header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
-            header4.createCell(2).setCellValue("鎬у埆");
-            header4.createCell(3).setCellValue("韬唤璇佸彿");
-            header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
-            header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+//            header4.createCell(2).setCellValue("鎬у埆");
+            header4.createCell(2).setCellValue("韬唤璇佸彿");
+            header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+            header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+            header4.createCell(5).setCellValue("澶囨敞");
             header4.setHeight((short) 500);
             for (int i = 0; i < 6; i++) {
                 configFirstCell(sxssfWorkbook,header4.getCell(i));
@@ -552,10 +553,11 @@
 //                    header5.setHeight((short) 300);
                     header5.createCell(0).setCellValue(rowIndex+1);
                     header5.createCell(1).setCellValue(StringUtils.defaultString(d.getMemberName(),""));
-                    header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
-                    header5.createCell(3).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
-                    header5.createCell(4).setCellValue(StringUtils.defaultString(d.getDuName(),""));
-                    header5.createCell(5).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+//                    header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
+                    header5.createCell(2).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
+                    header5.createCell(3).setCellValue(StringUtils.defaultString(d.getDuName(),""));
+                    header5.createCell(4).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+                    header5.createCell(5).setCellValue(StringUtils.defaultString(d.getRemark(),""));
                     // 璁剧疆鏁版嵁鍗曞厓鏍�
                     for (int i = 0; i < 6; i++) {
                         configDataCell(sxssfWorkbook,   header5.getCell(i));
@@ -626,7 +628,7 @@
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
             for (int i = 0; i < 12; i++) {
-                sheet.setColumnWidth(i, ((i==3|| i== 5 || i==9|| i==11)?16:8) * 2 * 256);
+                sheet.setColumnWidth(i, ((i==2|| i== 3 || i==8|| i==9|| i==10)?16:8) * 2 * 256);
             }
             sheet.createFreezePane(0, 1);
             sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,11));
@@ -640,34 +642,47 @@
             }
             Row header1 = sheet.createRow(1);
             header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
-            header1.createCell(3).setCellValue("淇濋櫓鏂规");
-            header1.createCell(4).setCellValue("淇濆崟鍙�");
-            header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+            header1.createCell(1).setCellValue("");
+            header1.createCell(2).setCellValue("淇濋櫓鏂规");
+            header1.createCell(3).setCellValue("淇濆崟鍙�");
+            header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+            header1.createCell(5).setCellValue("");
             header1.createCell(6).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
-            header1.createCell(9).setCellValue("鍔犱繚浜烘暟");
-            header1.createCell(10).setCellValue("鍑忎繚浜烘暟");
-            header1.createCell(11).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+            header1.createCell(7).setCellValue("");
+            header1.createCell(8).setCellValue("鏈熸湜鎵瑰鐢熸晥鏃ユ湡");
+            header1.createCell(9).setCellValue("鏈熸湜鎵瑰噺鐢熸晥鏃ユ湡");
+            header1.createCell(10).setCellValue("鍔犱繚浜烘暟");
+            header1.createCell(11).setCellValue("鍑忎繚浜烘暟");
             for (int i = 0; i < 12; i++) {
                 configFirstCell(sxssfWorkbook,header1.getCell(i));
             }
-            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,2));
-            sheet.addMergedRegion(new CellRangeAddress(1  ,1,6,8));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,4,5));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,6,7));
 
             Row header2 = sheet.createRow(2);
             header2.createCell(0).setCellValue(data.getCompanyName());
-            header2.createCell(3).setCellValue(data.getSolutionsName());
-            header2.createCell(4).setCellValue(data.getApplyCode());
-            header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+            header2.createCell(1).setCellValue("");
+            header2.createCell(2).setCellValue(data.getSolutionsName());
+            header2.createCell(3).setCellValue(data.getApplyCode());
+            header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+            header2.createCell(5).setCellValue("");
             header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
-            header2.createCell(9).setCellValue(data.getAddNum());
-            header2.createCell(10).setCellValue(data.getDelNum());
-            header2.createCell(11).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
-            sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,2));
-            sheet.addMergedRegion(new CellRangeAddress(2  ,2,6,8));
+            header2.createCell(7).setCellValue("");
+            header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
+            header2.createCell(9).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getDelValidTime()));
+            header2.createCell(10).setCellValue(data.getAddNum());
+            header2.createCell(11).setCellValue(data.getDelNum());
+            sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(2 ,2,4,5));
+            sheet.addMergedRegion(new CellRangeAddress(2  ,2,6,7));
             for (int i = 0; i < 12; i++) {
                 configDataCell(sxssfWorkbook,   header2.getCell(i));
             }
             Row header3 = sheet.createRow(3);
+            for (int i = 0; i < 12; i++) {
+                header3.createCell(i).setCellValue("");
+            }
             header3.createCell(0).setCellValue("鍔犱繚浜哄憳");
             header3.createCell(6).setCellValue("鍑忎繚浜哄憳");
             sheet.addMergedRegion(new CellRangeAddress(3  ,3,0,5));
@@ -678,16 +693,18 @@
             Row header4 = sheet.createRow(4);
             header4.createCell(0).setCellValue("搴忓彿");
             header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
-            header4.createCell(2).setCellValue("鎬у埆");
-            header4.createCell(3).setCellValue("韬唤璇佸彿");
-            header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
-            header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+//            header4.createCell(2).setCellValue("鎬у埆");
+            header4.createCell(2).setCellValue("韬唤璇佸彿");
+            header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+            header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+            header4.createCell(5).setCellValue("澶囨敞");
             header4.createCell(6).setCellValue("搴忓彿");
             header4.createCell(7).setCellValue("鍛樺伐濮撳悕");
-            header4.createCell(8).setCellValue("鎬у埆");
-            header4.createCell(9).setCellValue("韬唤璇佸彿");
-            header4.createCell(10).setCellValue("娲鹃仯鍗曚綅");
-            header4.createCell(11).setCellValue("鎵�灞炲伐绉�");
+//            header4.createCell(8).setCellValue("鎬у埆");
+            header4.createCell(8).setCellValue("韬唤璇佸彿");
+            header4.createCell(9).setCellValue("娲鹃仯鍗曚綅");
+            header4.createCell(10).setCellValue("鎵�灞炲伐绉�");
+            header4.createCell(11).setCellValue("澶囨敞");
             for (int i = 0; i < 12; i++) {
                 configFirstCell(sxssfWorkbook,header4.getCell(i));
             }
@@ -700,10 +717,11 @@
                 if(addModel!=null){
                     header5.createCell(0).setCellValue(rowIndex+1);
                     header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
-                    header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
-                    header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
-                    header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
-                    header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+//                    header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+                    header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+                    header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+                    header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+                    header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
                 }else{
                     for (int i = 0; i < 6; i++) {
                         header5.createCell(i).setCellValue("");
@@ -712,10 +730,11 @@
                 if(delModel!=null){
                     header5.createCell(6).setCellValue(rowIndex+1);
                     header5.createCell(7).setCellValue(StringUtils.defaultString(delModel.getMemberName(),""));
-                    header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
-                    header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
-                    header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
-                    header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+//                    header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
+                    header5.createCell(8).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
+                    header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
+                    header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+                    header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getRemark(),""));
                 }else{
                     for (int i =6; i < 12; i++) {
                         header5.createCell(i).setCellValue("");
@@ -751,46 +770,54 @@
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
             for (int i = 0; i < 12; i++) {
-                sheet.setColumnWidth(i, ((i==3|| i==4|| i== 5 || i==9||i==10||  i==11)?16:8) * 2 * 256);
+                sheet.setColumnWidth(i, ((i==2|| i== 3 || i==8|| i==9|| i==10)?16:8) * 2 * 256);
             }
             sheet.createFreezePane(0, 1);
             sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,11));
             Row title = sheet.createRow(0);
-            title.setHeight((short) 2000);
+            title.setHeight((short) 800);
+            Cell c = title.createCell(0);
+            c.setCellValue(sheetName);
             for (int i = 0; i < 12; i++) {
-                title.createCell(i).setCellValue(i==0?sheetName:"");
+//                title.createCell(i).setCellValue(i==0?sheetName:"");
                 configTitleCell(sxssfWorkbook,title.getCell(i));
             }
             Row header1 = sheet.createRow(1);
-            header1.createCell(0).setCellValue(cellValue);
-            header1.createCell(3).setCellValue("淇濋櫓鏂规");
-            header1.createCell(4).setCellValue("淇濆崟鍙�");
-            header1.createCell(5).setCellValue("淇濋櫓鐢熸晥璧锋湡");
+            header1.createCell(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(9).setCellValue("鍔犱繚浜烘暟");
-            header1.createCell(10).setCellValue("鍑忎繚浜烘暟");
-            header1.createCell(11).setCellValue("鏈熸湜鎵瑰崟鐢熸晥鏈�");
+            header1.createCell(7).setCellValue("");
+            header1.createCell(8).setCellValue("鏈熸湜鎵瑰鐢熸晥鏃ユ湡");
+            header1.createCell(9).setCellValue("鏈熸湜鎵瑰噺鐢熸晥鏃ユ湡");
+            header1.createCell(10).setCellValue("鍔犱繚浜烘暟");
+            header1.createCell(11).setCellValue("鍑忎繚浜烘暟");
             for (int i = 0; i < 12; i++) {
                 configFirstCell(sxssfWorkbook,header1.getCell(i));
             }
-            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,2));
-            sheet.addMergedRegion(new CellRangeAddress(1  ,1,6,8));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,1));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,4,5));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,6,7));
 
             Row header2 = sheet.createRow(2);
             header2.createCell(0).setCellValue(data.getCompanyName());
             header2.createCell(1).setCellValue("");
-            header2.createCell(2).setCellValue("");
-            header2.createCell(3).setCellValue(data.getSolutionsName());
-            header2.createCell(4).setCellValue(data.getApplyCode());
-            header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+            header2.createCell(2).setCellValue(data.getSolutionsName());
+            header2.createCell(3).setCellValue(data.getApplyCode());
+            header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
+            header2.createCell(5).setCellValue("");
             header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
             header2.createCell(7).setCellValue("");
-            header2.createCell(8).setCellValue("");
-            header2.createCell(9).setCellValue(data.getAddNum());
-            header2.createCell(10).setCellValue(data.getDelNum());
-            header2.createCell(11).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
-            sheet.addMergedRegion(new CellRangeAddress(2 ,2,0,2));
-            sheet.addMergedRegion(new CellRangeAddress(2  ,2,6,8));
+            header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.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));
             }
@@ -805,16 +832,18 @@
             Row header4 = sheet.createRow(4);
             header4.createCell(0).setCellValue("搴忓彿");
             header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
-            header4.createCell(2).setCellValue("鎬у埆");
-            header4.createCell(3).setCellValue("韬唤璇佸彿");
-            header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
-            header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+//            header4.createCell(2).setCellValue("鎬у埆");
+            header4.createCell(2).setCellValue("韬唤璇佸彿");
+            header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+            header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+            header4.createCell(5).setCellValue("澶囨敞");
             header4.createCell(6).setCellValue("搴忓彿");
             header4.createCell(7).setCellValue("鍛樺伐濮撳悕");
-            header4.createCell(8).setCellValue("鎬у埆");
-            header4.createCell(9).setCellValue("韬唤璇佸彿");
-            header4.createCell(10).setCellValue("娲鹃仯鍗曚綅");
-            header4.createCell(11).setCellValue("鎵�灞炲伐绉�");
+//            header4.createCell(8).setCellValue("鎬у埆");
+            header4.createCell(8).setCellValue("韬唤璇佸彿");
+            header4.createCell(9).setCellValue("娲鹃仯鍗曚綅");
+            header4.createCell(10).setCellValue("鎵�灞炲伐绉�");
+            header4.createCell(11).setCellValue("澶囨敞");
             for (int i = 0; i < 12; i++) {
                 configFirstCell(sxssfWorkbook,header4.getCell(i));
             }
@@ -827,10 +856,11 @@
                 if(addModel!=null){
                     header5.createCell(0).setCellValue(rowIndex+1);
                     header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
-                    header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
-                    header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
-                    header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
-                    header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+//                    header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+                    header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+                    header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+                    header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+                    header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
                 }else{
                     for (int i = 0; i < 6; i++) {
                         header5.createCell(i).setCellValue("");
@@ -839,10 +869,11 @@
                 if(delModel!=null){
                     header5.createCell(6).setCellValue(rowIndex+1);
                     header5.createCell(7).setCellValue(StringUtils.defaultString(delModel.getMemberName(),""));
-                    header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
-                    header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
-                    header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
-                    header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+//                    header5.createCell(8).setCellValue(Constants.equalsInteger(delModel.getSex(),0)?"鐢�":(Constants.equalsInteger(delModel.getSex(),1)?"濂�":"-"));
+                    header5.createCell(8).setCellValue(StringUtils.defaultString(delModel.getMemberIdcardNo(),""));
+                    header5.createCell(9).setCellValue(StringUtils.defaultString(delModel.getDuName(),""));
+                    header5.createCell(10).setCellValue(StringUtils.defaultString(delModel.getWorkTypeName(),""));
+                    header5.createCell(11).setCellValue(StringUtils.defaultString(delModel.getRemark(),""));
                 }else{
                     for (int i =6; i < 12; i++) {
                         header5.createCell(i).setCellValue("");
@@ -912,7 +943,7 @@
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
             for (int i = 0; i < 8; i++) {
-                sheet.setColumnWidth(i, ((i==3|| i== 5 || i==7)?16:8) * 2 * 256);
+                sheet.setColumnWidth(i, ((i==2|| i==3 || i==6|| i==7|| i==4|| i==5)?16:8) * 2 * 256);
             }
             sheet.createFreezePane(0, 1);
             sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,7));
@@ -929,8 +960,8 @@
             }
             Row header1 = sheet.createRow(1);
             header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
-            header1.createCell(1).setCellValue("淇濋櫓鏂规");
-            header1.createCell(2).setCellValue("");
+            header1.createCell(1).setCellValue("");
+            header1.createCell(2).setCellValue("淇濋櫓鏂规");
             header1.createCell(3).setCellValue("淇濆崟鍙�");
             header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
             header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
@@ -939,30 +970,31 @@
             for (int i = 0; i < 8; i++) {
                 configFirstCell(sxssfWorkbook,header1.getCell(i));
             }
-            sheet.addMergedRegion(new CellRangeAddress(1  ,1,1,2));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,1));
 
             Row header2 = sheet.createRow(2);
             header2.createCell(0).setCellValue(data.getCompanyName());
-            header2.createCell(1).setCellValue(data.getSolutionsName());
-            header2.createCell(2).setCellValue("");
+            header2.createCell(1).setCellValue("");
+            header2.createCell(2).setCellValue(data.getSolutionsName());
             header2.createCell(3).setCellValue(data.getApplyCode());
             header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
             header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
             header2.createCell(6).setCellValue(data.getChangeNum());
             header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
-            sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,2));
+            sheet.addMergedRegion(new CellRangeAddress(2  ,2,0,1));
             for (int i = 0; i < 8; i++) {
                 configDataCell(sxssfWorkbook,header2.getCell(i));
             }
             Row header4 = sheet.createRow(3);
             header4.createCell(0).setCellValue("搴忓彿");
             header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
-            header4.createCell(2).setCellValue("鎬у埆");
-            header4.createCell(3).setCellValue("韬唤璇佸彿");
-            header4.createCell(4).setCellValue("鍘熸淳閬e崟浣�");
-            header4.createCell(5).setCellValue("鍘熸墍鎵�灞炲伐绉�");
-            header4.createCell(6).setCellValue("鏇存敼鍚庢淳閬e崟浣�");
-            header4.createCell(7).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+//            header4.createCell(2).setCellValue("鎬у埆");
+            header4.createCell(2).setCellValue("韬唤璇佸彿");
+            header4.createCell(3).setCellValue("鍘熸淳閬e崟浣�");
+            header4.createCell(4).setCellValue("鍘熸墍鎵�灞炲伐绉�");
+            header4.createCell(5).setCellValue("鏇存敼鍚庢淳閬e崟浣�");
+            header4.createCell(6).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+            header4.createCell(7).setCellValue("澶囨敞");
             for (int i = 0; i < 8; i++) {
                 configFirstCell(sxssfWorkbook,header4.getCell(i));
             }
@@ -972,12 +1004,13 @@
                 Row header5 = sheet.createRow(rowIndex + 4);
                 header5.createCell(0).setCellValue(rowIndex+1);
                 header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
-                header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
-                header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
-                header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
-                header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
-                header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
-                header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+//                header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+                header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+                header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
+                header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
+                header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+                header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+                header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
                 for (int i = 0; i < 8; i++) {
                     configDataCell(sxssfWorkbook,header5.getCell(i));
                 }
@@ -1007,12 +1040,12 @@
             sxssfWorkbook = new SXSSFWorkbook();
             Sheet sheet = sxssfWorkbook.createSheet(sheetName);
             for (int i = 0; i < 8; i++) {
-                sheet.setColumnWidth(i, ((i==3|| i== 4|| i== 5 ||i== 6 || i==7)?16:8) * 2 * 256);
+                sheet.setColumnWidth(i, ((i==2|| i==3 || i==6|| i==7|| i==4|| i==5)?16:8) * 2 * 256);
             }
             sheet.createFreezePane(0, 1);
             sheet.addMergedRegion(new CellRangeAddress(0   ,0,0,7));
             Row title = sheet.createRow(0);
-            title.setHeight((short) 2000);
+            title.setHeight((short) 1000);
             Cell c = title.createCell(0);
             c.setCellValue(sheetName);
             configFirstCell(sxssfWorkbook,c);
@@ -1023,9 +1056,9 @@
                 configTitleCell(sxssfWorkbook,title.getCell(i));
             }
             Row header1 = sheet.createRow(1);
-            header1.createCell(0).setCellValue(cellValue);
-            header1.createCell(1).setCellValue("淇濋櫓鏂规");
-            header1.createCell(2).setCellValue("");
+            header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
+            header1.createCell(1).setCellValue("");
+            header1.createCell(2).setCellValue("淇濋櫓鏂规");
             header1.createCell(3).setCellValue("淇濆崟鍙�");
             header1.createCell(4).setCellValue("淇濋櫓鐢熸晥璧锋湡");
             header1.createCell(5).setCellValue("淇濋櫓鐢熸晥姝㈡湡");
@@ -1034,30 +1067,31 @@
             for (int i = 0; i < 8; i++) {
                 configFirstCell(sxssfWorkbook,header1.getCell(i));
             }
-            sheet.addMergedRegion(new CellRangeAddress(1  ,1,1,2));
+            sheet.addMergedRegion(new CellRangeAddress(1  ,1,0,1));
 
             Row header2 = sheet.createRow(2);
             header2.createCell(0).setCellValue(data.getCompanyName());
-            header2.createCell(1).setCellValue(data.getSolutionsName());
-            header2.createCell(2).setCellValue("");
+            header2.createCell(1).setCellValue("");
+            header2.createCell(2).setCellValue(data.getSolutionsName());
             header2.createCell(3).setCellValue(data.getApplyCode());
             header2.createCell(4).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
             header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
             header2.createCell(6).setCellValue(data.getChangeNum());
             header2.createCell(7).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
-            sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,2));
+            sheet.addMergedRegion(new CellRangeAddress(2  ,2,0,1));
             for (int i = 0; i < 8; i++) {
                 configDataCell(sxssfWorkbook,header2.getCell(i));
             }
             Row header4 = sheet.createRow(3);
             header4.createCell(0).setCellValue("搴忓彿");
             header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
-            header4.createCell(2).setCellValue("鎬у埆");
-            header4.createCell(3).setCellValue("韬唤璇佸彿");
-            header4.createCell(4).setCellValue("鍘熸淳閬e崟浣�");
-            header4.createCell(5).setCellValue("鍘熸墍鎵�灞炲伐绉�");
-            header4.createCell(6).setCellValue("鏇存敼鍚庢淳閬e崟浣�");
-            header4.createCell(7).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+//            header4.createCell(2).setCellValue("鎬у埆");
+            header4.createCell(2).setCellValue("韬唤璇佸彿");
+            header4.createCell(3).setCellValue("鍘熸淳閬e崟浣�");
+            header4.createCell(4).setCellValue("鍘熸墍鎵�灞炲伐绉�");
+            header4.createCell(5).setCellValue("鏇存敼鍚庢淳閬e崟浣�");
+            header4.createCell(6).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+            header4.createCell(7).setCellValue("澶囨敞");
             for (int i = 0; i < 8; i++) {
                 configFirstCell(sxssfWorkbook,header4.getCell(i));
             }
@@ -1067,12 +1101,13 @@
                 Row header5 = sheet.createRow(rowIndex + 4);
                 header5.createCell(0).setCellValue(rowIndex+1);
                 header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
-                header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
-                header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
-                header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
-                header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
-                header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
-                header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+//                header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+                header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getMemberIdcardNo(),""));
+                header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getOldDuName(),""));
+                header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getOldWorkTypeName(),""));
+                header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+                header5.createCell(6).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+                header5.createCell(7).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
                 for (int i = 0; i < 8; i++) {
                     configDataCell(sxssfWorkbook,header5.getCell(i));
                 }
@@ -1178,10 +1213,11 @@
             Row header4 = sheet.createRow(3);
             header4.createCell(0).setCellValue("搴忓彿");
             header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
-            header4.createCell(2).setCellValue("鎬у埆");
-            header4.createCell(3).setCellValue("韬唤璇佸彿");
-            header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
-            header4.createCell(5).setCellValue("鎵�鎵�灞炲伐绉�");
+//            header4.createCell(2).setCellValue("鎬у埆");
+            header4.createCell(2).setCellValue("韬唤璇佸彿");
+            header4.createCell(3).setCellValue("娲鹃仯鍗曚綅");
+            header4.createCell(4).setCellValue("鎵�灞炲伐绉�");
+            header4.createCell(5).setCellValue("澶囨敞");
             for (int i = 0; i < 6; i++) {
                 configFirstCell(sxssfWorkbook,header4.getCell(i));
             }
@@ -1191,10 +1227,11 @@
                 Row header5 = sheet.createRow(rowIndex + 4);
                 header5.createCell(0).setCellValue(rowIndex+1);
                 header5.createCell(1).setCellValue(StringUtils.defaultString(addModel.getMemberName(),""));
-                header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
-                header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getIdcardNo(),""));
-                header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
-                header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+//                header5.createCell(2).setCellValue(Constants.equalsInteger(addModel.getSex(),0)?"鐢�":(Constants.equalsInteger(addModel.getSex(),1)?"濂�":"-"));
+                header5.createCell(2).setCellValue(StringUtils.defaultString(addModel.getIdcardNo(),""));
+                header5.createCell(3).setCellValue(StringUtils.defaultString(addModel.getDuName(),""));
+                header5.createCell(4).setCellValue(StringUtils.defaultString(addModel.getWorkTypeName(),""));
+                header5.createCell(5).setCellValue(StringUtils.defaultString(addModel.getRemark(),""));
                 for (int i = 0; i < 6; i++) {
                     configDataCell(sxssfWorkbook,header5.getCell(i));
                 }
@@ -1324,11 +1361,12 @@
             Row header4 = sheet.createRow(3);
             header4.createCell(0).setCellValue("搴忓彿");
             header4.createCell(1).setCellValue("鍛樺伐濮撳悕");
-            header4.createCell(2).setCellValue("鎬у埆");
-            header4.createCell(3).setCellValue("韬唤璇佸彿");
-            header4.createCell(4).setCellValue("琚繚闄╀汉");
-            header4.createCell(5).setCellValue("娲鹃仯鍗曚綅");
-            header4.createCell(6).setCellValue("鎵�灞炲伐绉�");
+//            header4.createCell(2).setCellValue("鎬у埆");
+            header4.createCell(2).setCellValue("韬唤璇佸彿");
+            header4.createCell(3).setCellValue("琚繚闄╀汉");
+            header4.createCell(4).setCellValue("娲鹃仯鍗曚綅");
+            header4.createCell(5).setCellValue("鎵�灞炲伐绉�");
+            header4.createCell(6).setCellValue("澶囨敞");
             header4.setHeight((short) 500);
             for (int i = 0; i < 7; i++) {
                 configFirstCell(sxssfWorkbook,header4.getCell(i));
@@ -1341,11 +1379,12 @@
 //                    header5.setHeight((short) 300);
                     header5.createCell(0).setCellValue(rowIndex+1);
                     header5.createCell(1).setCellValue(StringUtils.defaultString(d.getMemberName(),""));
-                    header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
-                    header5.createCell(3).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
-                    header5.createCell(4).setCellValue(StringUtils.defaultString(d.getCompanyName(),""));
-                    header5.createCell(5).setCellValue(StringUtils.defaultString(d.getDuName(),""));
-                    header5.createCell(6).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+//                    header5.createCell(2).setCellValue(Constants.equalsInteger(d.getSex(),0)?"鐢�":(Constants.equalsInteger(d.getSex(),1)?"濂�":"-"));
+                    header5.createCell(2).setCellValue(StringUtils.defaultString(d.getIdcardNo(),""));
+                    header5.createCell(3).setCellValue(StringUtils.defaultString(d.getCompanyName(),""));
+                    header5.createCell(4).setCellValue(StringUtils.defaultString(d.getDuName(),""));
+                    header5.createCell(5).setCellValue(StringUtils.defaultString(d.getWorkTypeName(),""));
+                    header5.createCell(6).setCellValue(StringUtils.defaultString(d.getRemark(),""));
                     // 璁剧疆鏁版嵁鍗曞厓鏍�
                     for (int i = 0; i < 7; i++) {
                         configDataCell(sxssfWorkbook,   header5.getCell(i));
@@ -1468,13 +1507,14 @@
                 Row header5 = sheet.createRow(row);
                 header5.createCell(0).setCellValue("搴忓彿");
                 header5.createCell(1).setCellValue("鍛樺伐濮撳悕");
-                header5.createCell(2).setCellValue("鎬у埆");
-                header5.createCell(3).setCellValue("韬唤璇佸彿");
-                header5.createCell(4).setCellValue("琚繚闄╀汉");
-                header5.createCell(5).setCellValue("鍘熸淳閬e崟浣�");
-                header5.createCell(6).setCellValue("鍘熸墍灞炲伐绉�");
-                header5.createCell(7).setCellValue("鏇存敼鍚庢淳閬e崟浣�");
-                header5.createCell(8).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+//                header5.createCell(2).setCellValue("鎬у埆");
+                header5.createCell(2).setCellValue("韬唤璇佸彿");
+                header5.createCell(3).setCellValue("琚繚闄╀汉");
+                header5.createCell(4).setCellValue("鍘熸淳閬e崟浣�");
+                header5.createCell(5).setCellValue("鍘熸墍灞炲伐绉�");
+                header5.createCell(6).setCellValue("鏇存敼鍚庢淳閬e崟浣�");
+                header5.createCell(7).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+                header5.createCell(8).setCellValue("澶囨敞");
                 for (int i = 0; i < 9; i++) {
                     configFirstCell(sxssfWorkbook,header5.getCell(i));
                 }
@@ -1484,13 +1524,14 @@
                     ApplyChagneDetail applyChagneDetail = otherChangeDetailList.get(rowIndex);
                     header6.createCell(0).setCellValue(rowIndex + 1);
                     header6.createCell(1).setCellValue(applyChagneDetail.getMemberName());
-                    header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
-                    header6.createCell(3).setCellValue(applyChagneDetail.getIdcardNo());
-                    header6.createCell(4).setCellValue(applyChagneDetail.getCompanyName());
-                    header6.createCell(5).setCellValue(applyChagneDetail.getOldDuName());
-                    header6.createCell(6).setCellValue(applyChagneDetail.getOldWorkTypeName());
-                    header6.createCell(7).setCellValue(applyChagneDetail.getDuName());
-                    header6.createCell(8).setCellValue(applyChagneDetail.getWorkTypeName());
+//                    header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+                    header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
+                    header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
+                    header6.createCell(4).setCellValue(applyChagneDetail.getOldDuName());
+                    header6.createCell(5).setCellValue(applyChagneDetail.getOldWorkTypeName());
+                    header6.createCell(6).setCellValue(applyChagneDetail.getDuName());
+                    header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
+                    header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
                     for (int i = 0; i < 9; i++) {
                         configDataCell(sxssfWorkbook,header6.getCell(i));
                     }
@@ -1620,32 +1661,34 @@
                 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(2).setCellValue("鎬у埆");
+                header5.createCell(2).setCellValue("韬唤璇佸彿");
+                header5.createCell(3).setCellValue("琚繚闄╀汉");
+                header5.createCell(4).setCellValue("娲鹃仯鍗曚綅");
+                header5.createCell(5).setCellValue("");
+                header5.createCell(6).setCellValue("鎵�灞炲伐绉�");
+                header5.createCell(7).setCellValue("澶囨敞");
                 for (int i = 0; i < 8; i++) {
                     configFirstCell(sxssfWorkbook,header5.getCell(i));
                 }
-                sheet.addMergedRegion(new CellRangeAddress(row  ,row,5,6));
+                sheet.addMergedRegion(new CellRangeAddress(row  ,row,4,5));
                 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(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+                    header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
+                    header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
+                    header6.createCell(4).setCellValue(applyChagneDetail.getDuName());
+                    header6.createCell(5).setCellValue("");
+                    header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName());
+                    header6.createCell(7).setCellValue(applyChagneDetail.getRemark());
                     for (int i = 0; i < 8; i++) {
                         configFirstCell(sxssfWorkbook,header6.getCell(i));
                     }
-                    sheet.addMergedRegion(new CellRangeAddress(row  ,row,5,6));
+                    sheet.addMergedRegion(new CellRangeAddress(row  ,row,4,5));
                 }
             }
 
@@ -1663,16 +1706,17 @@
                 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(2).setCellValue("鎬у埆");
+                header5.createCell(2).setCellValue("韬唤璇佸彿");
+                header5.createCell(3).setCellValue("琚繚闄╀汉");
+                header5.createCell(4).setCellValue("娲鹃仯鍗曚綅");
+                header5.createCell(5).setCellValue("");
+                header5.createCell(6).setCellValue("鎵�灞炲伐绉�");
+                header5.createCell(7).setCellValue("澶囨敞");
                 for (int i = 0; i < 8; i++) {
                     configFirstCell(sxssfWorkbook,header5.getCell(i));
                 }
-                sheet.addMergedRegion(new CellRangeAddress(row  ,row,5,6));
+                sheet.addMergedRegion(new CellRangeAddress(row  ,row,4,5));
 
                 row = row + 1 ;
                 for (int rowIndex = 0; rowIndex < reduceChangeDetailList.size(); rowIndex++) {
@@ -1681,16 +1725,17 @@
                     ApplyChagneDetail applyChagneDetail = reduceChangeDetailList.get(rowIndex);
                     header6.createCell(0).setCellValue(rowIndex + 1);
                     header6.createCell(1).setCellValue(applyChagneDetail.getMemberName());
-                    header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
-                    header6.createCell(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(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+                    header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
+                    header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
+                    header6.createCell(4).setCellValue(applyChagneDetail.getDuName());
+                    header6.createCell(5).setCellValue("");
+                    header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName());
+                    header6.createCell(7).setCellValue(applyChagneDetail.getRemark());
                     for (int i = 0; i < 8; i++) {
                         configDataCell(sxssfWorkbook,header6.getCell(i));
                     }
-                    sheet.addMergedRegion(new CellRangeAddress(row  ,row,5,6));
+                    sheet.addMergedRegion(new CellRangeAddress(row  ,row,4,5));
                 }
             }
 
@@ -1838,32 +1883,34 @@
                 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(2).setCellValue("鎬у埆");
+                header5.createCell(2).setCellValue("韬唤璇佸彿");
+                header5.createCell(3).setCellValue("琚繚闄╀汉");
+                header5.createCell(4).setCellValue("娲鹃仯鍗曚綅");
+                header5.createCell(5).setCellValue("");
+                header5.createCell(6).setCellValue("鎵�灞炲伐绉�");
+                header5.createCell(7).setCellValue("澶囨敞");
                 for (int i = 0; i < 8; i++) {
                     configFirstCell(sxssfWorkbook,header5.getCell(i));
                 }
-                sheet.addMergedRegion(new CellRangeAddress(row  ,row,5,6));
+                sheet.addMergedRegion(new CellRangeAddress(row  ,row,4,5));
                 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(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+                    header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
+                    header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
+                    header6.createCell(4).setCellValue(applyChagneDetail.getDuName());
+                    header6.createCell(5).setCellValue("");
+                    header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName());
+                    header6.createCell(7).setCellValue(applyChagneDetail.getRemark());
                     for (int i = 0; i < 8; i++) {
                         configDataCell(sxssfWorkbook,header6.getCell(i));
                     }
-                    sheet.addMergedRegion(new CellRangeAddress(row  ,row,5,6));
+                    sheet.addMergedRegion(new CellRangeAddress(row  ,row,4,5));
                 }
             }
 
@@ -1881,16 +1928,17 @@
                 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(2).setCellValue("鎬у埆");
+                header5.createCell(2).setCellValue("韬唤璇佸彿");
+                header5.createCell(3).setCellValue("琚繚闄╀汉");
+                header5.createCell(4).setCellValue("娲鹃仯鍗曚綅");
+                header5.createCell(5).setCellValue("");
+                header5.createCell(6).setCellValue("鎵�灞炲伐绉�");
+                header5.createCell(7).setCellValue("澶囨敞");
                 for (int i = 0; i < 8; i++) {
                     configFirstCell(sxssfWorkbook,header5.getCell(i));
                 }
-                sheet.addMergedRegion(new CellRangeAddress(row  ,row,5,6));
+                sheet.addMergedRegion(new CellRangeAddress(row  ,row,4,5));
 
                 row = row + 1 ;
                 for (int rowIndex = 0; rowIndex < reduceChangeDetailList.size(); rowIndex++) {
@@ -1899,16 +1947,17 @@
                     ApplyChagneDetail applyChagneDetail = reduceChangeDetailList.get(rowIndex);
                     header6.createCell(0).setCellValue(rowIndex + 1);
                     header6.createCell(1).setCellValue(applyChagneDetail.getMemberName());
-                    header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
-                    header6.createCell(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(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+                    header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
+                    header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
+                    header6.createCell(4).setCellValue(applyChagneDetail.getDuName());
+                    header6.createCell(5).setCellValue("");
+                    header6.createCell(6).setCellValue(applyChagneDetail.getWorkTypeName());
+                    header6.createCell(7).setCellValue(applyChagneDetail.getRemark());
                     for (int i = 0; i < 8; i++) {
                         configFirstCell(sxssfWorkbook,header6.getCell(i));
                     }
-                    sheet.addMergedRegion(new CellRangeAddress(row  ,row,5,6));
+                    sheet.addMergedRegion(new CellRangeAddress(row  ,row,2,3));
                 }
             }
             sxssfWorkbook.write(os);
@@ -2011,13 +2060,14 @@
                 Row header5 = sheet.createRow(row);
                 header5.createCell(0).setCellValue("搴忓彿");
                 header5.createCell(1).setCellValue("鍛樺伐濮撳悕");
-                header5.createCell(2).setCellValue("鎬у埆");
-                header5.createCell(3).setCellValue("韬唤璇佸彿");
-                header5.createCell(4).setCellValue("琚繚闄╀汉");
-                header5.createCell(5).setCellValue("鍘熸淳閬e崟浣�");
-                header5.createCell(6).setCellValue("鍘熸墍灞炲伐绉�");
-                header5.createCell(7).setCellValue("鏇存敼鍚庢淳閬e崟浣�");
-                header5.createCell(8).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+//                header5.createCell(2).setCellValue("鎬у埆");
+                header5.createCell(2).setCellValue("韬唤璇佸彿");
+                header5.createCell(3).setCellValue("琚繚闄╀汉");
+                header5.createCell(4).setCellValue("鍘熸淳閬e崟浣�");
+                header5.createCell(5).setCellValue("鍘熸墍灞炲伐绉�");
+                header5.createCell(6).setCellValue("鏇存敼鍚庢淳閬e崟浣�");
+                header5.createCell(7).setCellValue("鏇存敼鍚庢墍灞炲伐绉�");
+                header5.createCell(8).setCellValue("澶囨敞");
                 for (int i = 0; i < 9; i++) {
                     configFirstCell(sxssfWorkbook,header5.getCell(i));
                 }
@@ -2027,13 +2077,14 @@
                     ApplyChagneDetail applyChagneDetail = otherChangeDetailList.get(rowIndex);
                     header6.createCell(0).setCellValue(rowIndex + 1);
                     header6.createCell(1).setCellValue(applyChagneDetail.getMemberName());
-                    header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
-                    header6.createCell(3).setCellValue(applyChagneDetail.getIdcardNo());
-                    header6.createCell(4).setCellValue(applyChagneDetail.getCompanyName());
-                    header6.createCell(5).setCellValue(applyChagneDetail.getOldDuName());
-                    header6.createCell(6).setCellValue(applyChagneDetail.getOldWorkTypeName());
-                    header6.createCell(7).setCellValue(applyChagneDetail.getDuName());
-                    header6.createCell(8).setCellValue(applyChagneDetail.getWorkTypeName());
+//                    header6.createCell(2).setCellValue(Constants.equalsInteger(applyChagneDetail.getSex(),0)?"鐢�":(Constants.equalsInteger(applyChagneDetail.getSex(),1)?"濂�":"-"));
+                    header6.createCell(2).setCellValue(applyChagneDetail.getIdcardNo());
+                    header6.createCell(3).setCellValue(applyChagneDetail.getCompanyName());
+                    header6.createCell(4).setCellValue(applyChagneDetail.getOldDuName());
+                    header6.createCell(5).setCellValue(applyChagneDetail.getOldWorkTypeName());
+                    header6.createCell(6).setCellValue(applyChagneDetail.getDuName());
+                    header6.createCell(7).setCellValue(applyChagneDetail.getWorkTypeName());
+                    header6.createCell(8).setCellValue(applyChagneDetail.getRemark());
                     for (int i = 0; i < 9; i++) {
                         configDataCell(sxssfWorkbook,header6.getCell(i));
                     }

--
Gitblit v1.9.3