Commit 3f595472 authored by neo's avatar neo

[bugfix] add blanck line to split multi logic

parent fbc7f1f1
......@@ -153,6 +153,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
FormulaEvaluator evaluator = newWorkbook.getCreationHelper().createFormulaEvaluator();
evaluator.evaluateAll();
//todo:loop all the cell which existing in the cellTemplateConfig, save the data to DB
for (int i = 0; i < sheetCount; i++) {
Sheet sheet = newWorkbook.getSheetAt(i);
......@@ -253,6 +254,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
periodCellTemplateConfigMapper.updateByPrimaryKey(periodCellTemplateConfig);
// }
String regexNormalCell = "[A-Z]{1,2}((?!0)[0-9]{1,3})";
p = Pattern.compile(regexNormalCell);
m = p.matcher(sourceFormula);
......@@ -306,6 +308,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
}
}
Optional<PeriodCellTemplate> tempPeriodCellTemplate = periodCellTemplateList.stream()
.filter(a -> a.getCellTemplateId().equals(periodCellTemplateConfig.getCellTemplateId()))
.findFirst();
......
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