From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java |  923 +++++++++++++++++++--------------------------------------
 1 files changed, 312 insertions(+), 611 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index efa3665..b37fc98 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -24,6 +24,7 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;
@@ -34,27 +35,7 @@
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ooxml.POIXMLDocumentPart;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.util.IOUtils;
@@ -87,16 +68,15 @@
 
 /**
  * Excel鐩稿叧澶勭悊
- * 
+ *
  * @author ruoyi
  */
-public class ExcelUtil<T>
-{
+public class ExcelUtil<T> {
     private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
 
     public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
 
-    public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
+    public static final String[] FORMULA_STR = {"=", "-", "+", "@"};
 
     /**
      * Excel sheet鏈�澶ц鏁帮紝榛樿65536
@@ -193,8 +173,7 @@
      */
     public String[] excludeFields;
 
-    public ExcelUtil(Class<T> clazz)
-    {
+    public ExcelUtil(Class<T> clazz) {
         this.clazz = clazz;
     }
 
@@ -204,15 +183,12 @@
      * @param fields 鍒楀睘鎬у悕 绀轰緥[鍗曚釜"name"/澶氫釜"id","name"]
      * @throws Exception
      */
-    public void hideColumn(String... fields)
-    {
+    public void hideColumn(String... fields) {
         this.excludeFields = fields;
     }
 
-    public void init(List<T> list, String sheetName, String title, Type type)
-    {
-        if (list == null)
-        {
+    public void init(List<T> list, String sheetName, String title, Type type) {
+        if (list == null) {
             list = new ArrayList<T>();
         }
         this.list = list;
@@ -228,15 +204,12 @@
     /**
      * 鍒涘缓excel绗竴琛屾爣棰�
      */
-    public void createTitle()
-    {
-        if (StringUtils.isNotEmpty(title))
-        {
+    public void createTitle() {
+        if (StringUtils.isNotEmpty(title)) {
             subMergedFirstRowNum++;
             subMergedLastRowNum++;
             int titleLastCol = this.fields.size() - 1;
-            if (isSubList())
-            {
+            if (isSubList()) {
                 titleLastCol = titleLastCol + subFields.size() - 1;
             }
             Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
@@ -251,16 +224,13 @@
     /**
      * 鍒涘缓瀵硅薄鐨勫瓙鍒楄〃鍚嶇О
      */
-    public void createSubHead()
-    {
-        if (isSubList())
-        {
+    public void createSubHead() {
+        if (isSubList()) {
             subMergedFirstRowNum++;
             subMergedLastRowNum++;
             Row subRow = sheet.createRow(rownum);
             int excelNum = 0;
-            for (Object[] objects : fields)
-            {
+            for (Object[] objects : fields) {
                 Excel attr = (Excel) objects[1];
                 Cell headCell1 = subRow.createCell(excelNum);
                 headCell1.setCellValue(attr.name());
@@ -269,8 +239,7 @@
             }
             int headFirstRow = excelNum - 1;
             int headLastRow = headFirstRow + subFields.size() - 1;
-            if (headLastRow > headFirstRow)
-            {
+            if (headLastRow > headFirstRow) {
                 sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));
             }
             rownum++;
@@ -279,102 +248,85 @@
 
     /**
      * 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist
-     * 
+     *
      * @param is 杈撳叆娴�
      * @return 杞崲鍚庨泦鍚�
      */
-    public List<T> importExcel(InputStream is) throws Exception
-    {
+    public List<T> importExcel(InputStream is) throws Exception {
         return importExcel(is, 0);
     }
 
     /**
      * 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist
-     * 
-     * @param is 杈撳叆娴�
+     *
+     * @param is       杈撳叆娴�
      * @param titleNum 鏍囬鍗犵敤琛屾暟
      * @return 杞崲鍚庨泦鍚�
      */
-    public List<T> importExcel(InputStream is, int titleNum) throws Exception
-    {
+    public List<T> importExcel(InputStream is, int titleNum) throws Exception {
         return importExcel(StringUtils.EMPTY, is, titleNum);
     }
 
     /**
      * 瀵筫xcel琛ㄥ崟鎸囧畾琛ㄦ牸绱㈠紩鍚嶈浆鎹㈡垚list
-     * 
+     *
      * @param sheetName 琛ㄦ牸绱㈠紩鍚�
-     * @param titleNum 鏍囬鍗犵敤琛屾暟
-     * @param is 杈撳叆娴�
+     * @param titleNum  鏍囬鍗犵敤琛屾暟
+     * @param is        杈撳叆娴�
      * @return 杞崲鍚庨泦鍚�
      */
-    public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception
-    {
+    public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception {
         this.type = Type.IMPORT;
         this.wb = WorkbookFactory.create(is);
         List<T> list = new ArrayList<T>();
         // 濡傛灉鎸囧畾sheet鍚�,鍒欏彇鎸囧畾sheet涓殑鍐呭 鍚﹀垯榛樿鎸囧悜绗�1涓猻heet
         Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
-        if (sheet == null)
-        {
+        if (sheet == null) {
             throw new IOException("鏂囦欢sheet涓嶅瓨鍦�");
         }
         boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook);
         Map<String, PictureData> pictures;
-        if (isXSSFWorkbook)
-        {
+        if (isXSSFWorkbook) {
             pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);
-        }
-        else
-        {
+        } else {
             pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb);
         }
         // 鑾峰彇鏈�鍚庝竴涓潪绌鸿鐨勮涓嬫爣锛屾瘮濡傛�昏鏁颁负n锛屽垯杩斿洖鐨勪负n-1
         int rows = sheet.getLastRowNum();
 
-        if (rows > 0)
-        {
+        if (rows > 0) {
             // 瀹氫箟涓�涓猰ap鐢ㄤ簬瀛樻斁excel鍒楃殑搴忓彿鍜宖ield.
             Map<String, Integer> cellMap = new HashMap<String, Integer>();
             // 鑾峰彇琛ㄥご
             Row heard = sheet.getRow(titleNum);
-            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
-            {
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
                 Cell cell = heard.getCell(i);
-                if (StringUtils.isNotNull(cell))
-                {
+                if (StringUtils.isNotNull(cell)) {
                     String value = this.getCellValue(heard, i).toString();
                     cellMap.put(value, i);
-                }
-                else
-                {
+                } else {
                     cellMap.put(null, i);
                 }
             }
             // 鏈夋暟鎹椂鎵嶅鐞� 寰楀埌绫荤殑鎵�鏈塮ield.
             List<Object[]> fields = this.getFields();
             Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
-            for (Object[] objects : fields)
-            {
+            for (Object[] objects : fields) {
                 Excel attr = (Excel) objects[1];
                 Integer column = cellMap.get(attr.name());
-                if (column != null)
-                {
+                if (column != null) {
                     fieldsMap.put(column, objects);
                 }
             }
-            for (int i = titleNum + 1; i <= rows; i++)
-            {
+            for (int i = titleNum + 1; i <= rows; i++) {
                 // 浠庣2琛屽紑濮嬪彇鏁版嵁,榛樿绗竴琛屾槸琛ㄥご.
                 Row row = sheet.getRow(i);
                 // 鍒ゆ柇褰撳墠琛屾槸鍚︽槸绌鸿
-                if (isRowEmpty(row))
-                {
+                if (isRowEmpty(row)) {
                     continue;
                 }
                 T entity = null;
-                for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet())
-                {
+                for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet()) {
                     Object val = this.getCellValue(row, entry.getKey());
 
                     // 濡傛灉涓嶅瓨鍦ㄥ疄渚嬪垯鏂板缓.
@@ -384,89 +336,52 @@
                     Excel attr = (Excel) entry.getValue()[1];
                     // 鍙栧緱绫诲瀷,骞舵牴鎹璞$被鍨嬭缃��.
                     Class<?> fieldType = field.getType();
-                    if (String.class == fieldType)
-                    {
+                    if (String.class == fieldType) {
                         String s = Convert.toStr(val);
-                        if (StringUtils.endsWith(s, ".0"))
-                        {
+                        if (StringUtils.endsWith(s, ".0")) {
                             val = StringUtils.substringBefore(s, ".0");
-                        }
-                        else
-                        {
+                        } else {
                             String dateFormat = field.getAnnotation(Excel.class).dateFormat();
-                            if (StringUtils.isNotEmpty(dateFormat))
-                            {
+                            if (StringUtils.isNotEmpty(dateFormat)) {
                                 val = parseDateToStr(dateFormat, val);
-                            }
-                            else
-                            {
+                            } else {
                                 val = Convert.toStr(val);
                             }
                         }
-                    }
-                    else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
-                    {
+                    } else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
                         val = Convert.toInt(val);
-                    }
-                    else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
-                    {
+                    } else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
                         val = Convert.toLong(val);
-                    }
-                    else if (Double.TYPE == fieldType || Double.class == fieldType)
-                    {
+                    } else if (Double.TYPE == fieldType || Double.class == fieldType) {
                         val = Convert.toDouble(val);
-                    }
-                    else if (Float.TYPE == fieldType || Float.class == fieldType)
-                    {
+                    } else if (Float.TYPE == fieldType || Float.class == fieldType) {
                         val = Convert.toFloat(val);
-                    }
-                    else if (BigDecimal.class == fieldType)
-                    {
+                    } else if (BigDecimal.class == fieldType) {
                         val = Convert.toBigDecimal(val);
-                    }
-                    else if (Date.class == fieldType)
-                    {
-                        if (val instanceof String)
-                        {
+                    } else if (Date.class == fieldType) {
+                        if (val instanceof String) {
                             val = DateUtils.parseDate(val);
-                        }
-                        else if (val instanceof Double)
-                        {
+                        } else if (val instanceof Double) {
                             val = DateUtil.getJavaDate((Double) val);
                         }
-                    }
-                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
-                    {
+                    } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
                         val = Convert.toBool(val, false);
                     }
-                    if (StringUtils.isNotNull(fieldType))
-                    {
+                    if (StringUtils.isNotNull(fieldType)) {
                         String propertyName = field.getName();
-                        if (StringUtils.isNotEmpty(attr.targetAttr()))
-                        {
+                        if (StringUtils.isNotEmpty(attr.targetAttr())) {
                             propertyName = field.getName() + "." + attr.targetAttr();
-                        }
-                        else if (StringUtils.isNotEmpty(attr.readConverterExp()))
-                        {
+                        } else if (StringUtils.isNotEmpty(attr.readConverterExp())) {
                             val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
-                        }
-                        else if (StringUtils.isNotEmpty(attr.dictType()))
-                        {
+                        } else if (StringUtils.isNotEmpty(attr.dictType())) {
                             val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
-                        }
-                        else if (!attr.handler().equals(ExcelHandlerAdapter.class))
-                        {
+                        } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
                             val = dataFormatHandlerAdapter(val, attr);
-                        }
-                        else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures))
-                        {
+                        } else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures)) {
                             PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey());
-                            if (image == null)
-                            {
+                            if (image == null) {
                                 val = "";
-                            }
-                            else
-                            {
+                            } else {
                                 byte[] data = image.getData();
                                 val = FileUtils.writeImportBytes(data);
                             }
@@ -482,54 +397,50 @@
 
     /**
      * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
-     * 
-     * @param list 瀵煎嚭鏁版嵁闆嗗悎
+     *
+     * @param list      瀵煎嚭鏁版嵁闆嗗悎
      * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
      * @return 缁撴灉
      */
-    public AjaxResult exportExcel(List<T> list, String sheetName)
-    {
+    public AjaxResult exportExcel(List<T> list, String sheetName) {
         return exportExcel(list, sheetName, StringUtils.EMPTY);
     }
 
     /**
      * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
-     * 
-     * @param list 瀵煎嚭鏁版嵁闆嗗悎
+     *
+     * @param list      瀵煎嚭鏁版嵁闆嗗悎
      * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
-     * @param title 鏍囬
+     * @param title     鏍囬
      * @return 缁撴灉
      */
-    public AjaxResult exportExcel(List<T> list, String sheetName, String title)
-    {
+    public AjaxResult exportExcel(List<T> list, String sheetName, String title) {
         this.init(list, sheetName, title, Type.EXPORT);
         return exportExcel();
     }
 
     /**
      * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
-     * 
-     * @param response 杩斿洖鏁版嵁
-     * @param list 瀵煎嚭鏁版嵁闆嗗悎
+     *
+     * @param response  杩斿洖鏁版嵁
+     * @param list      瀵煎嚭鏁版嵁闆嗗悎
      * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
      * @return 缁撴灉
      */
-    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName)
-    {
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName) {
         exportExcel(response, list, sheetName, StringUtils.EMPTY);
     }
 
     /**
      * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
-     * 
-     * @param response 杩斿洖鏁版嵁
-     * @param list 瀵煎嚭鏁版嵁闆嗗悎
+     *
+     * @param response  杩斿洖鏁版嵁
+     * @param list      瀵煎嚭鏁版嵁闆嗗悎
      * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
-     * @param title 鏍囬
+     * @param title     鏍囬
      * @return 缁撴灉
      */
-    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title)
-    {
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title) {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
         this.init(list, sheetName, title, Type.EXPORT);
@@ -538,48 +449,44 @@
 
     /**
      * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
-     * 
+     *
      * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
      * @return 缁撴灉
      */
-    public AjaxResult importTemplateExcel(String sheetName)
-    {
+    public AjaxResult importTemplateExcel(String sheetName) {
         return importTemplateExcel(sheetName, StringUtils.EMPTY);
     }
 
     /**
      * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
-     * 
+     *
      * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
-     * @param title 鏍囬
+     * @param title     鏍囬
      * @return 缁撴灉
      */
-    public AjaxResult importTemplateExcel(String sheetName, String title)
-    {
+    public AjaxResult importTemplateExcel(String sheetName, String title) {
         this.init(null, sheetName, title, Type.IMPORT);
         return exportExcel();
     }
 
     /**
      * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
-     * 
+     *
      * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
      * @return 缁撴灉
      */
-    public void importTemplateExcel(HttpServletResponse response, String sheetName)
-    {
+    public void importTemplateExcel(HttpServletResponse response, String sheetName) {
         importTemplateExcel(response, sheetName, StringUtils.EMPTY);
     }
 
     /**
      * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
-     * 
+     *
      * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
-     * @param title 鏍囬
+     * @param title     鏍囬
      * @return 缁撴灉
      */
-    public void importTemplateExcel(HttpServletResponse response, String sheetName, String title)
-    {
+    public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
         this.init(null, sheetName, title, Type.IMPORT);
@@ -588,49 +495,37 @@
 
     /**
      * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
-     * 
+     *
      * @return 缁撴灉
      */
-    public void exportExcel(HttpServletResponse response)
-    {
-        try
-        {
+    public void exportExcel(HttpServletResponse response) {
+        try {
             writeSheet();
             wb.write(response.getOutputStream());
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
-        }
-        finally
-        {
+        } finally {
             IOUtils.closeQuietly(wb);
         }
     }
 
     /**
      * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
-     * 
+     *
      * @return 缁撴灉
      */
-    public AjaxResult exportExcel()
-    {
+    public AjaxResult exportExcel() {
         OutputStream out = null;
-        try
-        {
+        try {
             writeSheet();
             String filename = encodingFilename(sheetName);
             out = new FileOutputStream(getAbsoluteFile(filename));
             wb.write(out);
             return AjaxResult.success(filename);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
             throw new UtilException("瀵煎嚭Excel澶辫触锛岃鑱旂郴缃戠珯绠$悊鍛橈紒");
-        }
-        finally
-        {
+        } finally {
             IOUtils.closeQuietly(wb);
             IOUtils.closeQuietly(out);
         }
@@ -639,37 +534,29 @@
     /**
      * 鍒涘缓鍐欏叆鏁版嵁鍒癝heet
      */
-    public void writeSheet()
-    {
+    public void writeSheet() {
         // 鍙栧嚭涓�鍏辨湁澶氬皯涓猻heet.
         int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize));
-        for (int index = 0; index < sheetNo; index++)
-        {
+        for (int index = 0; index < sheetNo; index++) {
             createSheet(sheetNo, index);
 
             // 浜х敓涓�琛�
             Row row = sheet.createRow(rownum);
             int column = 0;
             // 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉�
-            for (Object[] os : fields)
-            {
+            for (Object[] os : fields) {
                 Field field = (Field) os[0];
                 Excel excel = (Excel) os[1];
-                if (Collection.class.isAssignableFrom(field.getType()))
-                {
-                    for (Field subField : subFields)
-                    {
+                if (Collection.class.isAssignableFrom(field.getType())) {
+                    for (Field subField : subFields) {
                         Excel subExcel = subField.getAnnotation(Excel.class);
                         this.createHeadCell(subExcel, row, column++);
                     }
-                }
-                else
-                {
+                } else {
                     this.createHeadCell(excel, row, column++);
                 }
             }
-            if (Type.EXPORT.equals(type))
-            {
+            if (Type.EXPORT.equals(type)) {
                 fillExcelData(index, row);
                 addStatisticsRow();
             }
@@ -678,57 +565,45 @@
 
     /**
      * 濉厖excel鏁版嵁
-     * 
+     *
      * @param index 搴忓彿
-     * @param row 鍗曞厓鏍艰
+     * @param row   鍗曞厓鏍艰
      */
     @SuppressWarnings("unchecked")
-    public void fillExcelData(int index, Row row)
-    {
+    public void fillExcelData(int index, Row row) {
         int startNo = index * sheetSize;
         int endNo = Math.min(startNo + sheetSize, list.size());
         int rowNo = (1 + rownum) - startNo;
-        for (int i = startNo; i < endNo; i++)
-        {
+        for (int i = startNo; i < endNo; i++) {
             rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
             row = sheet.createRow(rowNo);
             // 寰楀埌瀵煎嚭瀵硅薄.
             T vo = (T) list.get(i);
             Collection<?> subList = null;
-            if (isSubList())
-            {
-                if (isSubListValue(vo))
-                {
+            if (isSubList()) {
+                if (isSubListValue(vo)) {
                     subList = getListCellValue(vo);
                     subMergedLastRowNum = subMergedLastRowNum + subList.size();
-                }
-                else
-                {
+                } else {
                     subMergedFirstRowNum++;
                     subMergedLastRowNum++;
                 }
             }
             int column = 0;
-            for (Object[] os : fields)
-            {
+            for (Object[] os : fields) {
                 Field field = (Field) os[0];
                 Excel excel = (Excel) os[1];
-                if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList))
-                {
+                if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList)) {
                     boolean subFirst = false;
-                    for (Object obj : subList)
-                    {
-                        if (subFirst)
-                        {
+                    for (Object obj : subList) {
+                        if (subFirst) {
                             rowNo++;
                             row = sheet.createRow(rowNo);
                         }
                         List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class);
                         int subIndex = 0;
-                        for (Field subField : subFields)
-                        {
-                            if (subField.isAnnotationPresent(Excel.class))
-                            {
+                        for (Field subField : subFields) {
+                            if (subField.isAnnotationPresent(Excel.class)) {
                                 subField.setAccessible(true);
                                 Excel attr = subField.getAnnotation(Excel.class);
                                 this.addCell(attr, row, (T) obj, subField, column + subIndex);
@@ -738,9 +613,7 @@
                         subFirst = true;
                     }
                     this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();
-                }
-                else
-                {
+                } else {
                     this.addCell(excel, row, vo, field, column++);
                 }
             }
@@ -749,12 +622,11 @@
 
     /**
      * 鍒涘缓琛ㄦ牸鏍峰紡
-     * 
+     *
      * @param wb 宸ヤ綔钖勫璞�
      * @return 鏍峰紡鍒楄〃
      */
-    private Map<String, CellStyle> createStyles(Workbook wb)
-    {
+    private Map<String, CellStyle> createStyles(Workbook wb) {
         // 鍐欏叆鍚勬潯璁板綍,姣忔潯璁板綍瀵瑰簲excel琛ㄤ腑鐨勪竴琛�
         Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
         CellStyle style = wb.createCellStyle();
@@ -782,6 +654,8 @@
         dataFont.setFontName("Arial");
         dataFont.setFontHeightInPoints((short) 10);
         style.setFont(dataFont);
+        DataFormat format = wb.createDataFormat();
+        style.setDataFormat(format.getFormat("@"));//璁剧疆鏂囨湰鏍煎紡
         styles.put("data", style);
 
         style = wb.createCellStyle();
@@ -802,19 +676,16 @@
 
     /**
      * 鏍规嵁Excel娉ㄨВ鍒涘缓琛ㄦ牸澶存牱寮�
-     * 
+     *
      * @param wb 宸ヤ綔钖勫璞�
      * @return 鑷畾涔夋牱寮忓垪琛�
      */
-    private Map<String, CellStyle> annotationHeaderStyles(Workbook wb, Map<String, CellStyle> styles)
-    {
+    private Map<String, CellStyle> annotationHeaderStyles(Workbook wb, Map<String, CellStyle> styles) {
         Map<String, CellStyle> headerStyles = new HashMap<String, CellStyle>();
-        for (Object[] os : fields)
-        {
+        for (Object[] os : fields) {
             Excel excel = (Excel) os[1];
             String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor());
-            if (!headerStyles.containsKey(key))
-            {
+            if (!headerStyles.containsKey(key)) {
                 CellStyle style = wb.createCellStyle();
                 style.cloneStyleFrom(styles.get("data"));
                 style.setAlignment(HorizontalAlignment.CENTER);
@@ -835,19 +706,16 @@
 
     /**
      * 鏍规嵁Excel娉ㄨВ鍒涘缓琛ㄦ牸鍒楁牱寮�
-     * 
+     *
      * @param wb 宸ヤ綔钖勫璞�
      * @return 鑷畾涔夋牱寮忓垪琛�
      */
-    private Map<String, CellStyle> annotationDataStyles(Workbook wb)
-    {
+    private Map<String, CellStyle> annotationDataStyles(Workbook wb) {
         Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
-        for (Object[] os : fields)
-        {
+        for (Object[] os : fields) {
             Excel excel = (Excel) os[1];
             String key = StringUtils.format("data_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor());
-            if (!styles.containsKey(key))
-            {
+            if (!styles.containsKey(key)) {
                 CellStyle style = wb.createCellStyle();
                 style.setAlignment(excel.align());
                 style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -875,20 +743,17 @@
     /**
      * 鍒涘缓鍗曞厓鏍�
      */
-    public Cell createHeadCell(Excel attr, Row row, int column)
-    {
+    public Cell createHeadCell(Excel attr, Row row, int column) {
         // 鍒涘缓鍒�
         Cell cell = row.createCell(column);
         // 鍐欏叆鍒椾俊鎭�
         cell.setCellValue(attr.name());
         setDataValidation(attr, row, column);
         cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
-        if (isSubList())
-        {
+        if (isSubList()) {
             // 濉厖榛樿鏍峰紡锛岄槻姝㈠悎骞跺崟鍏冩牸鏍峰紡澶辨晥
             sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor())));
-            if (attr.needMerge())
-            {
+            if (attr.needMerge()) {
                 sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));
             }
         }
@@ -897,43 +762,32 @@
 
     /**
      * 璁剧疆鍗曞厓鏍间俊鎭�
-     * 
+     *
      * @param value 鍗曞厓鏍煎��
-     * @param attr 娉ㄨВ鐩稿叧
-     * @param cell 鍗曞厓鏍间俊鎭�
+     * @param attr  娉ㄨВ鐩稿叧
+     * @param cell  鍗曞厓鏍间俊鎭�
      */
-    public void setCellVo(Object value, Excel attr, Cell cell)
-    {
-        if (ColumnType.STRING == attr.cellType())
-        {
+    public void setCellVo(Object value, Excel attr, Cell cell) {
+        if (ColumnType.STRING == attr.cellType()) {
             String cellValue = Convert.toStr(value);
             // 瀵逛簬浠讳綍浠ヨ〃杈惧紡瑙﹀彂瀛楃 =-+@寮�澶寸殑鍗曞厓鏍硷紝鐩存帴浣跨敤tab瀛楃浣滀负鍓嶇紑锛岄槻姝SV娉ㄥ叆銆�
-            if (StringUtils.startsWithAny(cellValue, FORMULA_STR))
-            {
+            if (StringUtils.startsWithAny(cellValue, FORMULA_STR)) {
                 cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0");
             }
-            if (value instanceof Collection && StringUtils.equals("[]", cellValue))
-            {
+            if (value instanceof Collection && StringUtils.equals("[]", cellValue)) {
                 cellValue = StringUtils.EMPTY;
             }
             cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix());
-        }
-        else if (ColumnType.NUMERIC == attr.cellType())
-        {
-            if (StringUtils.isNotNull(value))
-            {
+        } else if (ColumnType.NUMERIC == attr.cellType()) {
+            if (StringUtils.isNotNull(value)) {
                 cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
             }
-        }
-        else if (ColumnType.IMAGE == attr.cellType())
-        {
+        } else if (ColumnType.IMAGE == attr.cellType()) {
             ClientAnchor anchor = new XSSFClientAnchor(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))
-            {
+            if (StringUtils.isNotEmpty(imagePath)) {
                 byte[] data = ImageUtils.getImage(imagePath);
-                getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
-                        cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+                getDrawingPatriarch(cell.getSheet()).createPicture(anchor, cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
             }
         }
     }
@@ -941,10 +795,8 @@
     /**
      * 鑾峰彇鐢诲竷
      */
-    public static Drawing<?> getDrawingPatriarch(Sheet sheet)
-    {
-        if (sheet.getDrawingPatriarch() == null)
-        {
+    public static Drawing<?> getDrawingPatriarch(Sheet sheet) {
+        if (sheet.getDrawingPatriarch() == null) {
             sheet.createDrawingPatriarch();
         }
         return sheet.getDrawingPatriarch();
@@ -953,15 +805,11 @@
     /**
      * 鑾峰彇鍥剧墖绫诲瀷,璁剧疆鍥剧墖鎻掑叆绫诲瀷
      */
-    public int getImageType(byte[] value)
-    {
+    public int getImageType(byte[] value) {
         String type = FileTypeUtils.getFileExtendName(value);
-        if ("JPG".equalsIgnoreCase(type))
-        {
+        if ("JPG".equalsIgnoreCase(type)) {
             return Workbook.PICTURE_TYPE_JPEG;
-        }
-        else if ("PNG".equalsIgnoreCase(type))
-        {
+        } else if ("PNG".equalsIgnoreCase(type)) {
             return Workbook.PICTURE_TYPE_PNG;
         }
         return Workbook.PICTURE_TYPE_JPEG;
@@ -970,26 +818,18 @@
     /**
      * 鍒涘缓琛ㄦ牸鏍峰紡
      */
-    public void setDataValidation(Excel attr, Row row, int column)
-    {
-        if (attr.name().indexOf("娉細") >= 0)
-        {
+    public void setDataValidation(Excel attr, Row row, int column) {
+        if (attr.name().indexOf("娉細") >= 0) {
             sheet.setColumnWidth(column, 6000);
-        }
-        else
-        {
+        } else {
             // 璁剧疆鍒楀
             sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
         }
-        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
-        {
-            if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255)
-            {
+        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0) {
+            if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255) {
                 // 濡傛灉涓嬫媺鏁板ぇ浜�15鎴栧瓧绗︿覆闀垮害澶т簬255锛屽垯浣跨敤涓�涓柊sheet瀛樺偍锛岄伩鍏嶇敓鎴愮殑妯℃澘涓嬫媺鍊艰幏鍙栦笉鍒�
                 setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
-            }
-            else
-            {
+            } else {
                 // 鎻愮ず淇℃伅鎴栧彧鑳介�夋嫨涓嶈兘杈撳叆鐨勫垪鍐呭.
                 setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
             }
@@ -999,20 +839,16 @@
     /**
      * 娣诲姞鍗曞厓鏍�
      */
-    public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
-    {
+    public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
         Cell cell = null;
-        try
-        {
+        try {
             // 璁剧疆琛岄珮
             row.setHeight(maxHeight);
             // 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑�,鏈変簺鎯呭喌闇�瑕佷繚鎸佷负绌�,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒�.
-            if (attr.isExport())
-            {
+            if (attr.isExport()) {
                 // 鍒涘缓cell
                 cell = row.createCell(column);
-                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
-                {
+                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge()) {
                     CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
                     sheet.addMergedRegion(cellAddress);
                 }
@@ -1024,36 +860,23 @@
                 String readConverterExp = attr.readConverterExp();
                 String separator = attr.separator();
                 String dictType = attr.dictType();
-                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
-                {
+                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) {
                     cell.setCellValue(parseDateToStr(dateFormat, value));
-                }
-                else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
-                {
+                } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) {
                     cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
-                }
-                else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value))
-                {
+                } else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) {
                     cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));
-                }
-                else if (value instanceof BigDecimal && -1 != attr.scale())
-                {
+                } else if (value instanceof BigDecimal && -1 != attr.scale()) {
                     cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).doubleValue());
-                }
-                else if (!attr.handler().equals(ExcelHandlerAdapter.class))
-                {
+                } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
                     cell.setCellValue(dataFormatHandlerAdapter(value, attr));
-                }
-                else
-                {
+                } else {
                     // 璁剧疆鍒楃被鍨�
                     setCellVo(value, attr, cell);
                 }
                 addStatisticsData(column, Convert.toStr(value), attr);
             }
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("瀵煎嚭Excel澶辫触{}", e);
         }
         return cell;
@@ -1061,36 +884,30 @@
 
     /**
      * 璁剧疆 POI XSSFSheet 鍗曞厓鏍兼彁绀烘垨閫夋嫨妗�
-     * 
-     * @param sheet 琛ㄥ崟
-     * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭
+     *
+     * @param sheet         琛ㄥ崟
+     * @param textlist      涓嬫媺妗嗘樉绀虹殑鍐呭
      * @param promptContent 鎻愮ず鍐呭
-     * @param firstRow 寮�濮嬭
-     * @param endRow 缁撴潫琛�
-     * @param firstCol 寮�濮嬪垪
-     * @param endCol 缁撴潫鍒�
+     * @param firstRow      寮�濮嬭
+     * @param endRow        缁撴潫琛�
+     * @param firstCol      寮�濮嬪垪
+     * @param endCol        缁撴潫鍒�
      */
-    public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow,
-            int firstCol, int endCol)
-    {
+    public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) {
         DataValidationHelper helper = sheet.getDataValidationHelper();
         DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1");
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
         DataValidation dataValidation = helper.createValidation(constraint, regions);
-        if (StringUtils.isNotEmpty(promptContent))
-        {
+        if (StringUtils.isNotEmpty(promptContent)) {
             // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀�
             dataValidation.createPromptBox("", promptContent);
             dataValidation.setShowPromptBox(true);
         }
         // 澶勭悊Excel鍏煎鎬ч棶棰�
-        if (dataValidation instanceof XSSFDataValidation)
-        {
+        if (dataValidation instanceof XSSFDataValidation) {
             dataValidation.setSuppressDropDownArrow(true);
             dataValidation.setShowErrorBox(true);
-        }
-        else
-        {
+        } else {
             dataValidation.setSuppressDropDownArrow(false);
         }
         sheet.addValidationData(dataValidation);
@@ -1098,21 +915,19 @@
 
     /**
      * 璁剧疆鏌愪簺鍒楃殑鍊煎彧鑳借緭鍏ラ鍒剁殑鏁版嵁,鏄剧ず涓嬫媺妗嗭紙鍏煎瓒呭嚭涓�瀹氭暟閲忕殑涓嬫媺妗嗭級.
-     * 
-     * @param sheet 瑕佽缃殑sheet.
-     * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭
+     *
+     * @param sheet         瑕佽缃殑sheet.
+     * @param textlist      涓嬫媺妗嗘樉绀虹殑鍐呭
      * @param promptContent 鎻愮ず鍐呭
-     * @param firstRow 寮�濮嬭
-     * @param endRow 缁撴潫琛�
-     * @param firstCol 寮�濮嬪垪
-     * @param endCol 缁撴潫鍒�
+     * @param firstRow      寮�濮嬭
+     * @param endRow        缁撴潫琛�
+     * @param firstCol      寮�濮嬪垪
+     * @param endCol        缁撴潫鍒�
      */
-    public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol)
-    {
+    public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) {
         String hideSheetName = "combo_" + firstCol + "_" + endCol;
         Sheet hideSheet = wb.createSheet(hideSheetName); // 鐢ㄤ簬瀛樺偍 涓嬫媺鑿滃崟鏁版嵁
-        for (int i = 0; i < textlist.length; i++)
-        {
+        for (int i = 0; i < textlist.length; i++) {
             hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);
         }
         // 鍒涘缓鍚嶇О锛屽彲琚叾浠栧崟鍏冩牸寮曠敤
@@ -1126,20 +941,16 @@
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
         // 鏁版嵁鏈夋晥鎬у璞�
         DataValidation dataValidation = helper.createValidation(constraint, regions);
-        if (StringUtils.isNotEmpty(promptContent))
-        {
+        if (StringUtils.isNotEmpty(promptContent)) {
             // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀�
             dataValidation.createPromptBox("", promptContent);
             dataValidation.setShowPromptBox(true);
         }
         // 澶勭悊Excel鍏煎鎬ч棶棰�
-        if (dataValidation instanceof XSSFDataValidation)
-        {
+        if (dataValidation instanceof XSSFDataValidation) {
             dataValidation.setSuppressDropDownArrow(true);
             dataValidation.setShowErrorBox(true);
-        }
-        else
-        {
+        } else {
             dataValidation.setSuppressDropDownArrow(false);
         }
 
@@ -1150,34 +961,26 @@
 
     /**
      * 瑙f瀽瀵煎嚭鍊� 0=鐢�,1=濂�,2=鏈煡
-     * 
+     *
      * @param propertyValue 鍙傛暟鍊�
-     * @param converterExp 缈昏瘧娉ㄨВ
-     * @param separator 鍒嗛殧绗�
+     * @param converterExp  缈昏瘧娉ㄨВ
+     * @param separator     鍒嗛殧绗�
      * @return 瑙f瀽鍚庡��
      */
-    public static String convertByExp(String propertyValue, String converterExp, String separator)
-    {
+    public static String convertByExp(String propertyValue, String converterExp, String separator) {
         StringBuilder propertyString = new StringBuilder();
         String[] convertSource = converterExp.split(",");
-        for (String item : convertSource)
-        {
+        for (String item : convertSource) {
             String[] itemArray = item.split("=");
-            if (StringUtils.containsAny(propertyValue, separator))
-            {
-                for (String value : propertyValue.split(separator))
-                {
-                    if (itemArray[0].equals(value))
-                    {
+            if (StringUtils.containsAny(propertyValue, separator)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[0].equals(value)) {
                         propertyString.append(itemArray[1] + separator);
                         break;
                     }
                 }
-            }
-            else
-            {
-                if (itemArray[0].equals(propertyValue))
-                {
+            } else {
+                if (itemArray[0].equals(propertyValue)) {
                     return itemArray[1];
                 }
             }
@@ -1187,34 +990,26 @@
 
     /**
      * 鍙嶅悜瑙f瀽鍊� 鐢�=0,濂�=1,鏈煡=2
-     * 
+     *
      * @param propertyValue 鍙傛暟鍊�
-     * @param converterExp 缈昏瘧娉ㄨВ
-     * @param separator 鍒嗛殧绗�
+     * @param converterExp  缈昏瘧娉ㄨВ
+     * @param separator     鍒嗛殧绗�
      * @return 瑙f瀽鍚庡��
      */
-    public static String reverseByExp(String propertyValue, String converterExp, String separator)
-    {
+    public static String reverseByExp(String propertyValue, String converterExp, String separator) {
         StringBuilder propertyString = new StringBuilder();
         String[] convertSource = converterExp.split(",");
-        for (String item : convertSource)
-        {
+        for (String item : convertSource) {
             String[] itemArray = item.split("=");
-            if (StringUtils.containsAny(propertyValue, separator))
-            {
-                for (String value : propertyValue.split(separator))
-                {
-                    if (itemArray[1].equals(value))
-                    {
+            if (StringUtils.containsAny(propertyValue, separator)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[1].equals(value)) {
                         propertyString.append(itemArray[0] + separator);
                         break;
                     }
                 }
-            }
-            else
-            {
-                if (itemArray[1].equals(propertyValue))
-                {
+            } else {
+                if (itemArray[1].equals(propertyValue)) {
                     return itemArray[0];
                 }
             }
@@ -1224,47 +1019,41 @@
 
     /**
      * 瑙f瀽瀛楀吀鍊�
-     * 
+     *
      * @param dictValue 瀛楀吀鍊�
-     * @param dictType 瀛楀吀绫诲瀷
+     * @param dictType  瀛楀吀绫诲瀷
      * @param separator 鍒嗛殧绗�
      * @return 瀛楀吀鏍囩
      */
-    public static String convertDictByExp(String dictValue, String dictType, String separator)
-    {
+    public static String convertDictByExp(String dictValue, String dictType, String separator) {
         return DictUtils.getDictLabel(dictType, dictValue, separator);
     }
 
     /**
      * 鍙嶅悜瑙f瀽鍊煎瓧鍏稿��
-     * 
+     *
      * @param dictLabel 瀛楀吀鏍囩
-     * @param dictType 瀛楀吀绫诲瀷
+     * @param dictType  瀛楀吀绫诲瀷
      * @param separator 鍒嗛殧绗�
      * @return 瀛楀吀鍊�
      */
-    public static String reverseDictByExp(String dictLabel, String dictType, String separator)
-    {
+    public static String reverseDictByExp(String dictLabel, String dictType, String separator) {
         return DictUtils.getDictValue(dictType, dictLabel, separator);
     }
 
     /**
      * 鏁版嵁澶勭悊鍣�
-     * 
+     *
      * @param value 鏁版嵁鍊�
      * @param excel 鏁版嵁娉ㄨВ
      * @return
      */
-    public String dataFormatHandlerAdapter(Object value, Excel excel)
-    {
-        try
-        {
+    public String dataFormatHandlerAdapter(Object value, Excel excel) {
+        try {
             Object instance = excel.handler().newInstance();
-            Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class });
+            Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class});
             value = formatMethod.invoke(instance, value, excel.args());
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("涓嶈兘鏍煎紡鍖栨暟鎹� " + excel.handler(), e.getMessage());
         }
         return Convert.toStr(value);
@@ -1273,21 +1062,15 @@
     /**
      * 鍚堣缁熻淇℃伅
      */
-    private void addStatisticsData(Integer index, String text, Excel entity)
-    {
-        if (entity != null && entity.isStatistics())
-        {
+    private void addStatisticsData(Integer index, String text, Excel entity) {
+        if (entity != null && entity.isStatistics()) {
             Double temp = 0D;
-            if (!statistics.containsKey(index))
-            {
+            if (!statistics.containsKey(index)) {
                 statistics.put(index, temp);
             }
-            try
-            {
+            try {
                 temp = Double.valueOf(text);
-            }
-            catch (NumberFormatException e)
-            {
+            } catch (NumberFormatException e) {
             }
             statistics.put(index, statistics.get(index) + temp);
         }
@@ -1296,18 +1079,15 @@
     /**
      * 鍒涘缓缁熻琛�
      */
-    public void addStatisticsRow()
-    {
-        if (statistics.size() > 0)
-        {
+    public void addStatisticsRow() {
+        if (statistics.size() > 0) {
             Row row = sheet.createRow(sheet.getLastRowNum() + 1);
             Set<Integer> keys = statistics.keySet();
             Cell cell = row.createCell(0);
             cell.setCellStyle(styles.get("total"));
             cell.setCellValue("鍚堣");
 
-            for (Integer key : keys)
-            {
+            for (Integer key : keys) {
                 cell = row.createCell(key);
                 cell.setCellStyle(styles.get("total"));
                 cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
@@ -1319,23 +1099,20 @@
     /**
      * 缂栫爜鏂囦欢鍚�
      */
-    public String encodingFilename(String filename)
-    {
+    public String encodingFilename(String filename) {
         filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
         return filename;
     }
 
     /**
      * 鑾峰彇涓嬭浇璺緞
-     * 
+     *
      * @param filename 鏂囦欢鍚嶇О
      */
-    public String getAbsoluteFile(String filename)
-    {
+    public String getAbsoluteFile(String filename) {
         String downloadPath = RuoYiConfig.getDownloadPath() + filename;
         File desc = new File(downloadPath);
-        if (!desc.getParentFile().exists())
-        {
+        if (!desc.getParentFile().exists()) {
             desc.getParentFile().mkdirs();
         }
         return downloadPath;
@@ -1343,29 +1120,23 @@
 
     /**
      * 鑾峰彇bean涓殑灞炴�у��
-     * 
-     * @param vo 瀹炰綋瀵硅薄
+     *
+     * @param vo    瀹炰綋瀵硅薄
      * @param field 瀛楁
      * @param excel 娉ㄨВ
      * @return 鏈�缁堢殑灞炴�у��
      * @throws Exception
      */
-    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
-    {
+    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception {
         Object o = field.get(vo);
-        if (StringUtils.isNotEmpty(excel.targetAttr()))
-        {
+        if (StringUtils.isNotEmpty(excel.targetAttr())) {
             String target = excel.targetAttr();
-            if (target.contains("."))
-            {
+            if (target.contains(".")) {
                 String[] targets = target.split("[.]");
-                for (String name : targets)
-                {
+                for (String name : targets) {
                     o = getValue(o, name);
                 }
-            }
-            else
-            {
+            } else {
                 o = getValue(o, target);
             }
         }
@@ -1374,16 +1145,14 @@
 
     /**
      * 浠ョ被鐨勫睘鎬х殑get鏂规硶鏂规硶褰㈠紡鑾峰彇鍊�
-     * 
+     *
      * @param o
      * @param name
      * @return value
      * @throws Exception
      */
-    private Object getValue(Object o, String name) throws Exception
-    {
-        if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name))
-        {
+    private Object getValue(Object o, String name) throws Exception {
+        if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) {
             Class<?> clazz = o.getClass();
             Field field = clazz.getDeclaredField(name);
             field.setAccessible(true);
@@ -1395,8 +1164,7 @@
     /**
      * 寰楀埌鎵�鏈夊畾涔夊瓧娈�
      */
-    private void createExcelField()
-    {
+    private void createExcelField() {
         this.fields = getFields();
         this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
         this.maxHeight = getRowHeight();
@@ -1405,27 +1173,21 @@
     /**
      * 鑾峰彇瀛楁娉ㄨВ淇℃伅
      */
-    public List<Object[]> getFields()
-    {
+    public List<Object[]> getFields() {
         List<Object[]> fields = new ArrayList<Object[]>();
         List<Field> tempFields = new ArrayList<>();
         tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
         tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
-        for (Field field : tempFields)
-        {
-            if (!ArrayUtils.contains(this.excludeFields, field.getName()))
-            {
+        for (Field field : tempFields) {
+            if (!ArrayUtils.contains(this.excludeFields, field.getName())) {
                 // 鍗曟敞瑙�
-                if (field.isAnnotationPresent(Excel.class))
-                {
+                if (field.isAnnotationPresent(Excel.class)) {
                     Excel attr = field.getAnnotation(Excel.class);
-                    if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
-                    {
+                    if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
                         field.setAccessible(true);
-                        fields.add(new Object[] { field, attr });
+                        fields.add(new Object[]{field, attr});
                     }
-                    if (Collection.class.isAssignableFrom(field.getType()))
-                    {
+                    if (Collection.class.isAssignableFrom(field.getType())) {
                         subMethod = getSubMethod(field.getName(), clazz);
                         ParameterizedType pt = (ParameterizedType) field.getGenericType();
                         Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
@@ -1434,16 +1196,13 @@
                 }
 
                 // 澶氭敞瑙�
-                if (field.isAnnotationPresent(Excels.class))
-                {
+                if (field.isAnnotationPresent(Excels.class)) {
                     Excels attrs = field.getAnnotation(Excels.class);
                     Excel[] excels = attrs.value();
-                    for (Excel attr : excels)
-                    {
-                        if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
-                        {
+                    for (Excel attr : excels) {
+                        if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
                             field.setAccessible(true);
-                            fields.add(new Object[] { field, attr });
+                            fields.add(new Object[]{field, attr});
                         }
                     }
                 }
@@ -1455,11 +1214,9 @@
     /**
      * 鏍规嵁娉ㄨВ鑾峰彇鏈�澶ц楂�
      */
-    public short getRowHeight()
-    {
+    public short getRowHeight() {
         double maxHeight = 0;
-        for (Object[] os : this.fields)
-        {
+        for (Object[] os : this.fields) {
             Excel excel = (Excel) os[1];
             maxHeight = Math.max(maxHeight, excel.height());
         }
@@ -1469,8 +1226,7 @@
     /**
      * 鍒涘缓涓�涓伐浣滅翱
      */
-    public void createWorkbook()
-    {
+    public void createWorkbook() {
         this.wb = new SXSSFWorkbook(500);
         this.sheet = wb.createSheet();
         wb.setSheetName(0, sheetName);
@@ -1479,15 +1235,13 @@
 
     /**
      * 鍒涘缓宸ヤ綔琛�
-     * 
+     *
      * @param sheetNo sheet鏁伴噺
-     * @param index 搴忓彿
+     * @param index   搴忓彿
      */
-    public void createSheet(int sheetNo, int index)
-    {
+    public void createSheet(int sheetNo, int index) {
         // 璁剧疆宸ヤ綔琛ㄧ殑鍚嶇О.
-        if (sheetNo > 1 && index > 0)
-        {
+        if (sheetNo > 1 && index > 0) {
             this.sheet = wb.createSheet();
             this.createTitle();
             wb.setSheetName(index, sheetName + index);
@@ -1496,59 +1250,40 @@
 
     /**
      * 鑾峰彇鍗曞厓鏍煎��
-     * 
-     * @param row 鑾峰彇鐨勮
+     *
+     * @param row    鑾峰彇鐨勮
      * @param column 鑾峰彇鍗曞厓鏍煎垪鍙�
      * @return 鍗曞厓鏍煎��
      */
-    public Object getCellValue(Row row, int column)
-    {
-        if (row == null)
-        {
+    public Object getCellValue(Row row, int column) {
+        if (row == null) {
             return row;
         }
         Object val = "";
-        try
-        {
+        try {
             Cell cell = row.getCell(column);
-            if (StringUtils.isNotNull(cell))
-            {
-                if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA)
-                {
+            if (StringUtils.isNotNull(cell)) {
+                if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) {
                     val = cell.getNumericCellValue();
-                    if (DateUtil.isCellDateFormatted(cell))
-                    {
+                    if (DateUtil.isCellDateFormatted(cell)) {
                         val = DateUtil.getJavaDate((Double) val); // POI Excel 鏃ユ湡鏍煎紡杞崲
-                    }
-                    else
-                    {
-                        if ((Double) val % 1 != 0)
-                        {
+                    } else {
+                        if ((Double) val % 1 != 0) {
                             val = new BigDecimal(val.toString());
-                        }
-                        else
-                        {
+                        } else {
                             val = new DecimalFormat("0").format(val);
                         }
                     }
-                }
-                else if (cell.getCellType() == CellType.STRING)
-                {
+                } else if (cell.getCellType() == CellType.STRING) {
                     val = cell.getStringCellValue();
-                }
-                else if (cell.getCellType() == CellType.BOOLEAN)
-                {
+                } else if (cell.getCellType() == CellType.BOOLEAN) {
                     val = cell.getBooleanCellValue();
-                }
-                else if (cell.getCellType() == CellType.ERROR)
-                {
+                } else if (cell.getCellType() == CellType.ERROR) {
                     val = cell.getErrorCellValue();
                 }
 
             }
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             return val;
         }
         return val;
@@ -1556,21 +1291,17 @@
 
     /**
      * 鍒ゆ柇鏄惁鏄┖琛�
-     * 
+     *
      * @param row 鍒ゆ柇鐨勮
      * @return
      */
-    private boolean isRowEmpty(Row row)
-    {
-        if (row == null)
-        {
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
             return true;
         }
-        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++)
-        {
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
             Cell cell = row.getCell(i);
-            if (cell != null && cell.getCellType() != CellType.BLANK)
-            {
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
                 return false;
             }
         }
@@ -1580,21 +1311,17 @@
     /**
      * 鑾峰彇Excel2003鍥剧墖
      *
-     * @param sheet 褰撳墠sheet瀵硅薄
+     * @param sheet    褰撳墠sheet瀵硅薄
      * @param workbook 宸ヤ綔绨垮璞�
      * @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData
      */
-    public static Map<String, PictureData> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)
-    {
+    public static Map<String, PictureData> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook) {
         Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
         List<HSSFPictureData> pictures = workbook.getAllPictures();
-        if (!pictures.isEmpty())
-        {
-            for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren())
-            {
+        if (!pictures.isEmpty()) {
+            for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) {
                 HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor();
-                if (shape instanceof HSSFPicture)
-                {
+                if (shape instanceof HSSFPicture) {
                     HSSFPicture pic = (HSSFPicture) shape;
                     int pictureIndex = pic.getPictureIndex() - 1;
                     HSSFPictureData picData = pictures.get(pictureIndex);
@@ -1603,9 +1330,7 @@
                 }
             }
             return sheetIndexPicMap;
-        }
-        else
-        {
+        } else {
             return sheetIndexPicMap;
         }
     }
@@ -1613,23 +1338,18 @@
     /**
      * 鑾峰彇Excel2007鍥剧墖
      *
-     * @param sheet 褰撳墠sheet瀵硅薄
+     * @param sheet    褰撳墠sheet瀵硅薄
      * @param workbook 宸ヤ綔绨垮璞�
      * @return Map key:鍥剧墖鍗曞厓鏍肩储寮曪紙1_1锛塖tring锛寁alue:鍥剧墖娴丳ictureData
      */
-    public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)
-    {
+    public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) {
         Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
-        for (POIXMLDocumentPart dr : sheet.getRelations())
-        {
-            if (dr instanceof XSSFDrawing)
-            {
+        for (POIXMLDocumentPart dr : sheet.getRelations()) {
+            if (dr instanceof XSSFDrawing) {
                 XSSFDrawing drawing = (XSSFDrawing) dr;
                 List<XSSFShape> shapes = drawing.getShapes();
-                for (XSSFShape shape : shapes)
-                {
-                    if (shape instanceof XSSFPicture)
-                    {
+                for (XSSFShape shape : shapes) {
+                    if (shape instanceof XSSFPicture) {
                         XSSFPicture pic = (XSSFPicture) shape;
                         XSSFClientAnchor anchor = pic.getPreferredSize();
                         CTMarker ctMarker = anchor.getFrom();
@@ -1644,32 +1364,23 @@
 
     /**
      * 鏍煎紡鍖栦笉鍚岀被鍨嬬殑鏃ユ湡瀵硅薄
-     * 
+     *
      * @param dateFormat 鏃ユ湡鏍煎紡
-     * @param val 琚牸寮忓寲鐨勬棩鏈熷璞�
+     * @param val        琚牸寮忓寲鐨勬棩鏈熷璞�
      * @return 鏍煎紡鍖栧悗鐨勬棩鏈熷瓧绗�
      */
-    public String parseDateToStr(String dateFormat, Object val)
-    {
-        if (val == null)
-        {
+    public String parseDateToStr(String dateFormat, Object val) {
+        if (val == null) {
             return "";
         }
         String str;
-        if (val instanceof Date)
-        {
+        if (val instanceof Date) {
             str = DateUtils.parseDateToStr(dateFormat, (Date) val);
-        }
-        else if (val instanceof LocalDateTime)
-        {
+        } else if (val instanceof LocalDateTime) {
             str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val));
-        }
-        else if (val instanceof LocalDate)
-        {
+        } else if (val instanceof LocalDate) {
             str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val));
-        }
-        else
-        {
+        } else {
             str = val.toString();
         }
         return str;
@@ -1678,31 +1389,25 @@
     /**
      * 鏄惁鏈夊璞$殑瀛愬垪琛�
      */
-    public boolean isSubList()
-    {
+    public boolean isSubList() {
         return StringUtils.isNotNull(subFields) && subFields.size() > 0;
     }
 
     /**
      * 鏄惁鏈夊璞$殑瀛愬垪琛紝闆嗗悎涓嶄负绌�
      */
-    public boolean isSubListValue(T vo)
-    {
+    public boolean isSubListValue(T vo) {
         return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;
     }
 
     /**
      * 鑾峰彇闆嗗悎鐨勫��
      */
-    public Collection<?> getListCellValue(Object obj)
-    {
+    public Collection<?> getListCellValue(Object obj) {
         Object value;
-        try
-        {
-            value = subMethod.invoke(obj, new Object[] {});
-        }
-        catch (Exception e)
-        {
+        try {
+            value = subMethod.invoke(obj, new Object[]{});
+        } catch (Exception e) {
             return new ArrayList<Object>();
         }
         return (Collection<?>) value;
@@ -1710,23 +1415,19 @@
 
     /**
      * 鑾峰彇瀵硅薄鐨勫瓙鍒楄〃鏂规硶
-     * 
-     * @param name 鍚嶇О
+     *
+     * @param name      鍚嶇О
      * @param pojoClass 绫诲璞�
      * @return 瀛愬垪琛ㄦ柟娉�
      */
-    public Method getSubMethod(String name, Class<?> pojoClass)
-    {
+    public Method getSubMethod(String name, Class<?> pojoClass) {
         StringBuffer getMethodName = new StringBuffer("get");
         getMethodName.append(name.substring(0, 1).toUpperCase());
         getMethodName.append(name.substring(1));
         Method method = null;
-        try
-        {
-            method = pojoClass.getMethod(getMethodName.toString(), new Class[] {});
-        }
-        catch (Exception e)
-        {
+        try {
+            method = pojoClass.getMethod(getMethodName.toString(), new Class[]{});
+        } catch (Exception e) {
             log.error("鑾峰彇瀵硅薄寮傚父{}", e.getMessage());
         }
         return method;

--
Gitblit v1.9.3