EXCEL自定义列处理

yzg-util-db/src/main/java/com/yanzuoguang/excel/ExcelConsole.java

@@ -3,6 +3,7 @@ package com.yanzuoguang.excel;
 import com.yanzuoguang.db.impl.DbRow;
 import com.yanzuoguang.util.YzgError;
 import com.yanzuoguang.util.base.ObjectHelper;
+import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.helper.FileHelper;
 import com.yanzuoguang.util.helper.StringHelper;
@@ -289,9 +290,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
             for (ExcelDefineCell cell : row.getCells()) {
                 cell.cellStyle = createCellStyle(cell);
                 Object value = cell.getValue();
-                if (value != null) {
-                    cell.cell = createCell(sheetRow, cell.getColumn(), StringHelper.isNumber(value), StringHelper.toString(value), cell.cellStyle);
-                }
+                cell.cell = createCell(sheetRow, cell.getColumn(), StringHelper.isNumber(value), StringHelper.toString(value), cell.cellStyle);
                 // 合并单元格
                 if (cell.getWidthSize() > 1 || cell.getHeightSize() > 1) {
                     int rowStart = rowIndex;
@@ -333,7 +332,13 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
                     String value = StringHelper.getFirst(ObjectHelper.getString(map, field));
                     sb.append(value);
                 });
+                if (StringHelper.isDouble(formula)) {
+                    return;
+                }
                 // 设置公式
+                if (cell.cell == null) {
+                    throw new CodeException("单元格没有找到，无法设置公式" + formula);
+                }
                 cell.cell.setCellFormula(formula);
             }
         }