Commit 961aa756 authored by neo's avatar neo

[BugFix] fixed bb formulate cannot xianshi

parent 4ceb93c1
......@@ -527,7 +527,7 @@ public class ReportGeneratorImpl {
List<CellCalcInfoDto> cellCalcInfoDtos = new ArrayList<>();
Map<String, List<PeriodCellTemplateConfigExtendDto>> myStream = new HashMap<>();
for (PeriodCellTemplateConfigExtendDto pctce : periodCellTemplateConfigExtendDtos) {
String key = pctce.getRowIndex() + "_" + pctce.getColumnIndex() + "_" + pctce.getReportTemplateID();
String key = pctce.getRowIndex() + "_" + pctce.getColumnIndex() + "_" + pctce.getReportTemplateId();
if (!myStream.containsKey(key)) myStream.put(key, new ArrayList<>());
myStream.get(key).add(pctce);
}
......@@ -544,7 +544,7 @@ public class ReportGeneratorImpl {
cellCalcInfoDto.setParsedFormula(convertListToString(myStream.get(m).stream()
.map(PeriodCellTemplateConfig::getParsedFormula).collect(Collectors.toList())));
//todo: add validation at here later
cellCalcInfoDto.setCellTemplateId(first.getCellTemplateID() + "");
cellCalcInfoDto.setCellTemplateId(first.getCellTemplateId() + "");
cellCalcInfoDto.setReportTemplateId(first.getReportTemplateId());
cellCalcInfoDto.setDataType(first.getDataType());
cellCalcInfoDto.setIsReadOnly(first.getReadOnly());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment