From 07a2f9c762efb3be3a29e2e8cc7004d4164cc9d8 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 22 十二月 2025 20:15:58 +0800
Subject: [PATCH] 修改了对应代码

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetSecond.java |  397 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 346 insertions(+), 51 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetSecond.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetSecond.java
index 6f40bb2..65859d0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetSecond.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetSecond.java
@@ -14,15 +14,18 @@
 import com.ruoyi.common.utils.reflect.ReflectUtils;
 import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
+import org.apache.poi.hssf.usermodel.HSSFDataValidation;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -31,6 +34,7 @@
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
+
 
 /**
  * Excel鐩稿叧澶勭悊
@@ -54,6 +58,14 @@
      * 瀵煎嚭绫诲瀷锛圗XPORT:瀵煎嚭鏁版嵁锛汭MPORT锛氬鍏ユā鏉匡級
      */
     private Excel.Type type;
+
+    public Workbook getWb() {
+        return wb;
+    }
+
+    public void setWb(Workbook wb) {
+        this.wb = wb;
+    }
 
     /**
      * 宸ヤ綔钖勫璞�
@@ -267,9 +279,9 @@
      * @return 缁撴灉
      * @throws IOException
      */
-    public void exportExcelManySheet(HttpServletResponse response, List<ExcelExp> list) throws IOException {
-        response.setContentType("application/vnd.ms-excel");
-        response.setCharacterEncoding("utf-8");
+    public void exportExcelManySheet(ByteOutputStream response, List<ExcelExp> list) throws IOException {
+//        response.setContentType("application/vnd.ms-excel");
+//        response.setCharacterEncoding("utf-8");
         try {
             createWorkbook();
             for (int index = 0; index <list.size(); index++) {
@@ -278,22 +290,232 @@
                 // 鍙栧嚭涓�鍏辨湁澶氬皯涓猻heet.
 //                    double sheetNo = Math.ceil(list.size() / sheetSize);
                 createSheetManySheet(index);
-                // 浜х敓涓�琛�
-                Row row = sheet.createRow(0);
-                int column = 0;
-                // 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉�
-                for (Object[] os : fields) {
-                    Excel excel = (Excel) os[1];
-                    this.createCell(excel, row, column++);
+                // 浜х敓涓�琛�    if(index == 1) {
+                if(index==1)
+                {
+                    Row row = sheet.createRow(0);
+                    row.setHeightInPoints(20); // 璁剧疆琛岄珮涓�20纾�
+                    int column = 0;
+                    row = sheet.createRow(0);
+                    sheet.addMergedRegion(new CellRangeAddress(2, 3, 0, 1));
+                    row = sheet.createRow(2);
+                    row.setHeightInPoints(100); // 璁剧疆琛岄珮涓�20纾�
+
+                    //鎷垮埌鍥剧墖
+                    // 鍒涘缓鍗曞厓鏍煎苟娣诲姞鍥剧墖
+                    Cell cell = row.createCell(0);
+//sheet.setColumnWidth(0, 20 * 256); // 绗竴鍒楀搴�20瀛楃
+//sheet.setColumnWidth(1, 15 * 256); // 绗簩鍒楀搴�15瀛楃
+//sheet.setColumnWidth(2, 25 * 256); // 绗笁鍒楀搴�25瀛楃 // 璁剧疆绗竴鍒楀搴︿负20涓瓧绗�
+
+                    // 璁剧疆浜岀淮鐮�
+                    byte[] data = list.get(index).getSedcode();
+                    if (data != null && data.length > 0) {
+                        // 鍒涘缓鍗曞厓鏍�
+                        Cell qrCell = sheet.createRow(2).createCell(1);
+                        // 璁剧疆琛岄珮瓒冲楂樹互鏄剧ず浜岀淮鐮�
+                        sheet.getRow(2).setHeightInPoints(100);
+                        // 浜岀淮鐮侀渶瑕佽緝澶х殑鍒楀鏉ユ樉绀猴紝璁剧疆涔嬪墠鍏堜繚瀛樺綋鍓嶅垪瀹�
+                        int currentColumnWidth = sheet.getColumnWidth(1);
+                        // 璁剧疆瓒冲瀹界殑鍒楀浠ユ樉绀轰簩缁寸爜
+                        sheet.setColumnWidth(1, 40 * 256);
+                        
+                        // 鍒涘缓鍥剧墖閿氱偣锛岃缃湪绗�2琛岀2鍒�
+                        // 浜岀淮鐮佹樉绀哄湪鍙充笂瑙掍笖涓嶅~婊℃暣涓牸瀛�
+                        // 缂╁皬鍥剧墖鑼冨洿锛氬彧鍗犵敤閮ㄥ垎鍗曞厓鏍肩┖闂�
+                        ClientAnchor anchor = new HSSFClientAnchor(600, 20, 1000, 200, (short) 1, 2, (short) 1, 2);
+                        // 璁剧疆鍥剧墖浣嶇疆鍜屽ぇ灏�
+                        anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_DONT_RESIZE);
+                        
+                        // 娣诲姞鍥剧墖鍒板伐浣滆〃
+                        getDrawingPatriarch(sheet).createPicture(anchor,
+                                wb.addPicture(data, getImageType(data)));
+                        // 浜岀淮鐮佹坊鍔犲畬鎴愬悗锛屾仮澶嶅師鏉ョ殑鍒楀璁剧疆
+                        sheet.setColumnWidth(1, currentColumnWidth);
+                    }
+
+
+
+                    // 浠�"妗f棣� (瀹�) 鍙�:"涓哄熀鍑嗭紝缁熶竴鎵�鏈夋爣棰樼殑闀垮害鍜屾牸寮�
+                    String [] tits = {
+                              "妗�                    鍙�:",
+                              "妗f棣�  (瀹�)  鍙�:",
+                               "缂�        寰�        鍙�:",
+                              "鍙�        鏂�        鍙�:",
+                              "妗�     鍗�    棰�    鍚�:",
+                              "缂�     鍒�    鏃�    鏈�:",
+                              "缂�     鍒�    鍗�    浣�:",
+                              "淇�     绠�    鏈�    闄�:",
+                              "瀵�                     绾�:"};
+
+                    List tmp = list.get(index).getDataset();
+                    Object obj = tmp.get(0);
+                    Field[] declaredFields = this.clazz.getDeclaredFields();
+                    System.out.println(declaredFields.length);
+                    int i = 0;
+                    for (Field field : declaredFields) {
+                        // 璁剧疆瀛楁鐨勮闂潈闄愶紝浠ヤ究浜庤闂鏈夊瓧娈�
+                        field.setAccessible(true);
+
+                        // 鑾峰彇瀛楁鐨勫悕绉板拰鍊�
+                        String fieldName = field.getName();
+                    //    Object fieldValue = field.get(person);
+                         Class<?> clazz = obj.getClass();
+                         Field field1 =clazz.getDeclaredField(fieldName);
+                         field1.setAccessible(true);
+                         Object fieldValue = field1.get(obj);
+                         if(fieldValue==null)
+                             fieldValue="";
+                         if(i <= 3)
+                            row = sheet.createRow(i+4);
+                         if(i > 3)
+                             row = sheet.createRow(i+7);
+                       // row.setHeight((short) 30);
+                        // 涓嶈缃浐瀹氳楂橈紝鍚庣画浣跨敤autoSizeRow鑷姩璋冩暣
+                        cell = row.createCell(0);
+                        // 鏍规嵁鐢ㄦ埛闇�姹傝缃浜屽瓙琛ㄦ牸鐨勫垪瀹�
+                        // 绗竴鍒楀搴﹁缃负27
+                        // 绗簩鍒楀搴﹁缃负51
+                        // 浣跨敤涓巃ddCell鏂规硶鐩稿悓鐨勮绠楀叕寮忚缃垪瀹�
+                        sheet.setColumnWidth(0, (int) ((29 + 0.72) * 256)); // 绗竴鍒楋細瀹藉害27
+                        sheet.setColumnWidth(1, (int) ((52 + 0.72) * 256)); // 绗簩鍒楋細瀹藉害51
+
+                        CellStyle style = wb.createCellStyle();
+                        style.setAlignment(HorizontalAlignment.RIGHT);
+                        style.setVerticalAlignment(VerticalAlignment.BOTTOM); // 璁剧疆鍨傜洿涓嬪榻�
+                        style.setWrapText(true); // 璁剧疆鑷姩鎹㈣
+
+                        // 璁剧疆瀛椾綋涓篢imes New Roman 18鍙�
+                        Font font = wb.createFont();
+                        font.setBold(true);
+                        font.setFontName("Times New Roman");
+                        font.setFontHeightInPoints((short) 18);
+                        style.setFont(font);
+                        style.setWrapText(true); // 璁剧疆鑷姩鎹㈣
+                        cell.setCellStyle(style);
+                        cell.setCellValue(tits[i]);
+                        Cell cel = row.createCell(1);
+                        CellStyle style1 = wb.createCellStyle();
+                        style1.setBorderBottom(BorderStyle.THIN); // 娣诲姞涓嬪垝绾�
+                        style1.setWrapText(true); // 璁剧疆鑷姩鎹㈣
+                        style1.setVerticalAlignment(VerticalAlignment.BOTTOM); // 璁剧疆鍨傜洿涓嬪榻�
+
+                        // 璁剧疆鍐呭瀛椾綋涓篢imes New Roman 16鍙�
+                        Font contentFont = wb.createFont();
+                        contentFont.setFontName("Times New Roman");
+                        contentFont.setFontHeightInPoints((short) 16);
+
+                        // 褰搃==4鏃讹紝涓烘枃瀛楁坊鍔犱笅鍒掔嚎
+                        if(i==4) {
+                            contentFont.setUnderline(Font.U_SINGLE); // 娣诲姞鍗曚笅鍒掔嚎
+                        }
+
+                        style1.setFont(contentFont);
+                        cel.setCellStyle(style1);
+                        if(i==4)
+                        {
+                            // 纭繚妗�     鍗�    棰�    鍚�:杩欎竴琛岃兘鏍规嵁鍐呭闀垮害鑷姩鎹㈣
+                            style1.setWrapText(true); // 鏄庣‘璁剧疆鑷姩鎹㈣
+                            cel.setCellStyle(style1);
+                        }
+                        // 澶勭悊鏃ユ湡鏍煎紡鍖栵紝鐗瑰埆鏄�"缂�  鍒�  鏃�  鏈�:"杩欎竴琛�
+                        if (i == 5 && fieldValue instanceof Date) {
+                            // 璁剧疆鏃ユ湡鏍煎紡涓簓yyy-MM-dd
+                            String dateStr = DateUtils.parseDateToStr("yyyy-MM-dd", (Date) fieldValue);
+                            cel.setCellValue(dateStr);
+                        } else {
+                            cel.setCellValue(fieldValue.toString());
+                        }
+
+                        // 瀵逛簬i==4鐨勬儏鍐碉紝纭繚琛岄珮鑳芥牴鎹唴瀹硅嚜鍔ㄨ皟鏁�
+                        if(i==4)
+                        {
+                            // 璁剧疆琛岄珮涓鸿嚜鍔ㄨ皟鏁达紙-1琛ㄧず鑷姩楂樺害锛�
+                            row.setHeight((short) -1);
+                            // 涓嶉檺鍒舵渶澶ц楂橈紝鍏佽鏍规嵁鍐呭鑷姩璋冩暣
+                        } else {
+                            // 浣跨敤setHeight鏂规硶璁剧疆琛岄珮涓鸿嚜鍔ㄨ皟鏁达紙-1琛ㄧず鑷姩楂樺害锛�
+                            row.setHeight((short) -1);
+                            // 纭繚琛岄珮鑷冲皯涓�40纾咃紝浣嗕笉闄愬埗鏈�澶ц楂�
+                            if (row.getHeightInPoints() < 40) {
+                                row.setHeightInPoints(40);
+                            }
+                        }
+                      //  sheet.setColumnWidth(0, 60 * 256);
+                        i++;
+                        if(i==3)
+                        {
+                            row = sheet.createRow(8);
+                            // 璁剧疆琛岄珮涓鸿嚜鍔ㄨ皟鏁�
+                            row.setHeight((short) -1);
+                            // row.setHeight((short) 30);
+                            row.setHeightInPoints(20); // 璁剧疆琛岄珮涓�20纾�
+                            row = sheet.createRow(9);
+                            //璁剧疆鏉″舰鐮�
+                            // 璁剧疆鏉″舰鐮�
+                            byte[] dat = list.get(index).getImgr();
+                            if (dat != null && dat.length > 0) {
+                                // 鍒涘缓鍗曞厓鏍�
+                                Cell barcodeCell = sheet.createRow(9).createCell(0);
+                                // 璁剧疆琛岄珮瓒冲楂樹互鏄剧ず鏉″舰鐮�
+                                sheet.getRow(9).setHeightInPoints(40);
+                                // 璁剧疆鍒楀瓒冲瀹戒互鏄剧ず鏉″舰鐮侊紝鍏堜繚瀛樺綋鍓嶅垪瀹�
+                                int currentColumnWidth0 = sheet.getColumnWidth(0);
+                                sheet.setColumnWidth(0, 40 * 256);
+
+                                // 鍒涘缓鍥剧墖閿氱偣锛岃缃湪绗�10琛岀1鍒�
+                                // 鏉″舰鐮佸眳涓笖涓嶈秴鍑虹浜屼釜鏍煎瓙
+                                // 璋冩暣缁撴潫鍒楃储寮曞拰浣嶇疆鍙傛暟
+                                // 澧炲姞dx1鍊硷紝浣挎潯褰㈢爜鏁翠綋鍚戝彸绉诲姩
+                                ClientAnchor anchor1 = new HSSFClientAnchor(660, 50, 900, 200, (short) 0, 9, (short) 1, 10);
+                                // 璁剧疆鍥剧墖浣嶇疆鍜屽ぇ灏�
+                                anchor1.setAnchorType(ClientAnchor.AnchorType.MOVE_DONT_RESIZE);
+
+                                // 娣诲姞鍥剧墖鍒板伐浣滆〃
+                                getDrawingPatriarch(sheet).createPicture(anchor1,
+                                        wb.addPicture(dat, getImageType(dat)));
+
+                                // 鏉″舰鐮佹坊鍔犲畬鎴愬悗锛屾仮澶嶅師鏉ョ殑鍒楀璁剧疆
+                                sheet.setColumnWidth(0, currentColumnWidth0);
+                            }
+
+
+
+
+                            row.setHeightInPoints(70); // 璁剧疆琛岄珮涓�20纾�
+                            row = sheet.createRow(10);
+                            row.setHeightInPoints(40); // 璁剧疆琛岄珮涓�20纾�
+                        }
+                        // 鎵撳嵃瀛楁鍚嶇О鍜屽��
+                        System.out.println(fieldName + ": " + fieldValue);
+                    }
+
+
+
+
                 }
-                if (Excel.Type.EXPORT.equals(type)) {
-                    fillExcelData(index, row);
-                    addStatisticsRow();
+                else {
+
+                    Row row = sheet.createRow(0);
+                    int column = 0;
+                    // 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉�
+                    for (Object[] os : fields) {
+                        Excel excel = (Excel) os[1];
+                        this.createCell(excel, row, column++);
+                    }
+                    if (Excel.Type.EXPORT.equals(type)) {
+                        fillExcelData(index, row);
+                        addStatisticsRow();
+                    }
                 }
             }
-            wb.write(response.getOutputStream());
+            wb.write(response);
         } catch (IOException e) {
             log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
+        } catch (NoSuchFieldException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
         } finally {
             if (wb != null) {
                 try {
@@ -302,13 +524,13 @@
                     e1.printStackTrace();
                 }
             }
-            if (response.getOutputStream() != null) {
-                try {
-                    response.getOutputStream().close();
-                } catch (IOException e1) {
-                    e1.printStackTrace();
-                }
-            }
+//            if (response.getOutputStream() != null) {
+//                try {
+//                    response.getOutputStream().close();
+//                } catch (IOException e1) {
+//                    e1.printStackTrace();
+//                }
+//            }
         }
 //        exportExcel(response.getOutputStream());
     }
@@ -388,6 +610,10 @@
                 row = sheet.createRow(i + 4 );
             else
                 row = sheet.createRow(i + 1 );
+
+            row.setHeightInPoints(40); // 璁剧疆琛岄珮涓�20纾�
+            // row.createCell(0)
+
             // 寰楀埌瀵煎嚭瀵硅薄.
             T vo = (T) list.get(i);
             int column = 0;
@@ -413,6 +639,8 @@
         CellStyle style = wb.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
         style.setBorderRight(BorderStyle.THIN);
         style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
         style.setBorderLeft(BorderStyle.THIN);
@@ -427,23 +655,41 @@
         style.setFont(dataFont);
         styles.put("data", style);
 
-        style = wb.createCellStyle();
-        style.cloneStyleFrom(styles.get("data"));
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        Font headerFont = wb.createFont();
-        headerFont.setFontName("Arial");
-        headerFont.setFontHeightInPoints((short) 10);
-        headerFont.setBold(true);
-        headerFont.setColor(IndexedColors.WHITE.getIndex());
-        style.setFont(headerFont);
-        styles.put("header", style);
+        // 鍒涘缓琛ㄥご鏍峰紡鏄犲皠锛屾牴鎹瓻xcel娉ㄨВ鍔ㄦ�佺敓鎴�
+        Map<String, CellStyle> headerStyles = new HashMap<String, CellStyle>();
+        for (Object[] os : fields)
+        {
+            Excel excel = (Excel) os[1];
+            String key = StringUtils.format("header_{}_{}_{}_{}_{}", excel.headerColor(), excel.headerBackgroundColor(), excel.headerFontName(), excel.headerFontBold(), excel.headerFontSize());
+            if (!headerStyles.containsKey(key))
+            {
+                 style = wb.createCellStyle();
+                style.cloneStyleFrom(styles.get("data"));
+                style.setAlignment(HorizontalAlignment.CENTER);
+                style.setVerticalAlignment(VerticalAlignment.CENTER);
+                // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+                style.setWrapText(true);
+                // 鏍规嵁娉ㄨВ璁剧疆琛ㄥご鑳屾櫙鑹� - 宸叉敞閲婏紝琛ㄥご涓嶆樉绀鸿儗鏅壊
+                /*if (excel.headerBackgroundColor() != IndexedColors.WHITE) {
+                    style.setFillForegroundColor(excel.headerBackgroundColor().index);
+                    style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+                }*/
+                Font headerFont = wb.createFont();
+                headerFont.setFontName(excel.headerFontName());
+                headerFont.setFontHeightInPoints((short) excel.headerFontSize()); // 浣跨敤Excel娉ㄨВ涓殑headerFontSize灞炴��
+                headerFont.setBold(excel.headerFontBold());
+                headerFont.setColor(excel.headerColor().index);
+                style.setFont(headerFont);
+                headerStyles.put(key, style);
+            }
+        }
+        styles.putAll(headerStyles);
 
         style = wb.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
         Font totalFont = wb.createFont();
         totalFont.setFontName("Arial");
         totalFont.setFontHeightInPoints((short) 10);
@@ -453,16 +699,22 @@
         style = wb.createCellStyle();
         style.cloneStyleFrom(styles.get("data"));
         style.setAlignment(HorizontalAlignment.LEFT);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
         styles.put("data1", style);
 
         style = wb.createCellStyle();
         style.cloneStyleFrom(styles.get("data"));
         style.setAlignment(HorizontalAlignment.CENTER);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
         styles.put("data2", style);
 
         style = wb.createCellStyle();
         style.cloneStyleFrom(styles.get("data"));
         style.setAlignment(HorizontalAlignment.RIGHT);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
         styles.put("data3", style);
 
         return styles;
@@ -477,7 +729,9 @@
         // 鍐欏叆鍒椾俊鎭�
         cell.setCellValue(attr.name());
         setDataValidation(attr, row, column);
-        cell.setCellStyle(styles.get("header"));
+        // 鏍规嵁Excel娉ㄨВ鍔ㄦ�侀�夋嫨琛ㄥご鏍峰紡
+        String key = StringUtils.format("header_{}_{}_{}_{}_{}", attr.headerColor(), attr.headerBackgroundColor(), attr.headerFontName(), attr.headerFontBold(), attr.headerFontSize());
+        cell.setCellStyle(styles.get(key));
         return cell;
     }
 
@@ -494,7 +748,7 @@
         } else if (Excel.ColumnType.NUMERIC == attr.cellType()) {
             cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
         } else if (Excel.ColumnType.IMAGE == attr.cellType()) {
-            ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1),
+            ClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1),
                     cell.getRow().getRowNum() + 1);
             String imagePath = Convert.toStr(value);
             if (StringUtils.isNotEmpty(imagePath)) {
@@ -541,12 +795,12 @@
         // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀�.
         if (StringUtils.isNotEmpty(attr.prompt())) {
             // 杩欓噷榛樿璁句簡2-101鍒楁彁绀�.
-            setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
+            setHSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
         }
         // 濡傛灉璁剧疆浜哻ombo灞炴�у垯鏈垪鍙兘閫夋嫨涓嶈兘杈撳叆
         if (attr.combo().length > 0) {
             // 杩欓噷榛樿璁句簡2-101鍒楀彧鑳介�夋嫨涓嶈兘杈撳叆.
-            setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
+            setHSSFValidation(sheet, attr.combo(), 1, 100, column, column);
         }
     }
 
@@ -556,12 +810,32 @@
     public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
         Cell cell = null;
         try {
-            // 璁剧疆琛岄珮
-            row.setHeight(maxHeight);
+            // 璁剧疆琛岄珮涓鸿嚜鍔ㄨ皟鏁�
+            row.setHeight((short) -1);
             // 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑�,鏈変簺鎯呭喌闇�瑕佷繚鎸佷负绌�,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒�.
             if (attr.isExport()) {
                 // 鍒涘缓cell
                 cell = row.createCell(column);
+                // 璁剧疆鍒楀锛屼娇鐢ˊExcel娉ㄨВ涓厤缃殑瀹藉害
+                if (column == 0) {
+                    // 绗竴鍒椾娇鐢ㄥ浐瀹氬搴�
+                    sheet.setColumnWidth(0, 20 * 256);
+                } else if (column == 1) {
+                    // 绗簩鍒椾娇鐢ˊExcel娉ㄨВ涓厤缃殑瀹藉害
+                    sheet.setColumnWidth(1, (int) ((attr.width() + 0.72) * 256));
+                }
+
+                CellStyle style = wb.createCellStyle();
+//                style.setAlignment(HorizontalAlignment.RIGHT);
+                style.setVerticalAlignment(VerticalAlignment.CENTER);
+                style.setVerticalAlignment(VerticalAlignment.CENTER); // 璁剧疆鍨傜洿灞呬腑
+                //  style.setAlignment(VerticalAlignment.CENTER);
+                Font font = wb.createFont();
+              //  font.setBold(true);
+                style.setFont(font);
+                style.setWrapText(true); // 璁剧疆鑷姩鎹㈣
+
+                cell.setCellStyle(style);
 //                attr.align();
 //                int align = attr.align().value;
 //                cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
@@ -590,7 +864,7 @@
     }
 
     /**
-     * 璁剧疆 POI XSSFSheet 鍗曞厓鏍兼彁绀�
+     * 璁剧疆 POI HSSFSheet 鍗曞厓鏍兼彁绀�
      *
      * @param sheet         琛ㄥ崟
      * @param promptTitle   鎻愮ず鏍囬
@@ -600,7 +874,7 @@
      * @param firstCol      寮�濮嬪垪
      * @param endCol        缁撴潫鍒�
      */
-    public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
+    public void setHSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
                               int firstCol, int endCol) {
         DataValidationHelper helper = sheet.getDataValidationHelper();
         DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
@@ -622,7 +896,7 @@
      * @param endCol   缁撴潫鍒�
      * @return 璁剧疆濂界殑sheet.
      */
-    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) {
+    public void setHSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) {
         DataValidationHelper helper = sheet.getDataValidationHelper();
         // 鍔犺浇涓嬫媺鍒楄〃鍐呭
         DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
@@ -631,11 +905,9 @@
         // 鏁版嵁鏈夋晥鎬у璞�
         DataValidation dataValidation = helper.createValidation(constraint, regions);
         // 澶勭悊Excel鍏煎鎬ч棶棰�
-        if (dataValidation instanceof XSSFDataValidation) {
-            dataValidation.setSuppressDropDownArrow(true);
-            dataValidation.setShowErrorBox(true);
-        } else {
+        if (dataValidation instanceof HSSFDataValidation) {
             dataValidation.setSuppressDropDownArrow(false);
+            dataValidation.setShowErrorBox(true);
         }
 
         sheet.addValidationData(dataValidation);
@@ -832,7 +1104,7 @@
      * 鍒涘缓涓�涓伐浣滅翱
      */
     public void createWorkbook() {
-        this.wb = new SXSSFWorkbook(500);
+        this.wb = new HSSFWorkbook();
     }
 
     /**
@@ -901,4 +1173,27 @@
         }
         return val;
     }
+
+    /**
+     * 灏咥pache POI鐨刉orkbook杞崲涓篈spose.Cells鐨刉orkbook
+     *
+     * @param poiWorkbook Apache POI鐨刉orkbook瀵硅薄
+     * @return Aspose.Cells鐨刉orkbook瀵硅薄
+     * @throws IOException IO寮傚父
+     */
+
+
+
 }
+
+
+
+
+
+
+
+
+
+
+
+

--
Gitblit v1.9.1