|
@@ -110,7 +110,7 @@ public class ReportCalcService {
|
|
|
|
|
|
Map<String, List<ReportCalculationModel>> selectCalcReportDatas = service.selectCalcReportData(reportDefinitionModel.getReportNo());
|
|
|
// 这张报表需要公式计算的 计算单元,配置中,需要明确,一旦公式类型,必须配置Excel来源公式 字典:UNIT_STYLE_TYPE
|
|
|
- List<ReportCalculationModel> fillInCalcs = selectCalcReportDatas.get("FillIn").stream().filter(e -> "1".equals(e.getUnitStyleType())).toList();
|
|
|
+ List<ReportCalculationModel> fillInCalcs = new ArrayList<>(selectCalcReportDatas.get("FillIn").stream().filter(e -> "1".equals(e.getUnitStyleType())).toList());
|
|
|
fillInCalcs.addAll(selectCalcReportDatas.get("Calc"));
|
|
|
File tempTmpFile = createTempReport(reportDefinitionModel, calcIndex, dataDate, context);
|
|
|
tempTmpFiles.add(tempTmpFile);
|