|
@@ -3,6 +3,7 @@ package com.sundata.product.rwa.calc.service;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.date.TimeInterval;
|
|
|
import cn.hutool.core.lang.UUID;
|
|
|
+import cn.hutool.core.util.NumberUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.extra.spring.SpringUtil;
|
|
|
import com.sundata.common.util.DBExecutor;
|
|
@@ -331,7 +332,11 @@ public class ReportCalcService {
|
|
|
cell.setCellValue(String.valueOf(reportUnitParamCalcModel.getValue()));
|
|
|
} else if ("3".equals(reportCalculationModel.getUnitStyleType())) {
|
|
|
// 如果单元格类型是数字
|
|
|
- cell.setCellValue((Double) DataUtil.getDataDefault(reportUnitParamCalcModel.getValue(), Double.class));
|
|
|
+ String value = String.valueOf(reportUnitParamCalcModel.getValue());
|
|
|
+ if ("null".equals(value)) {
|
|
|
+ value = "0.0";
|
|
|
+ }
|
|
|
+ cell.setCellValue(NumberUtil.parseDouble(value,0.0));
|
|
|
} else {
|
|
|
cell.setCellValue("");
|
|
|
}
|