Commit 2948f07a authored by neo's avatar neo

[dev] bb prarameter index reduce 1

parent 5d1f6902
......@@ -42,9 +42,9 @@ public class ReportCellDataSourceDto extends FormulaDataSourceDto {
dataSource.name = DataSourceName.ReportDataSource;
dataSource.year = currentPeriodBo.curYear;
dataSource.period = currentPeriodBo.curPeriod;
dataSource.columnIndex = bbParasBo.getColumnIndex();
dataSource.columnIndex = bbParasBo.getColumnIndex() - 1;
dataSource.columnName = cellTemplateData.getColumnName();
dataSource.rowIndex = bbParasBo.getRowIndex();
dataSource.rowIndex = bbParasBo.getRowIndex() - 1;
dataSource.rowName = cellTemplateData.getRowName();
dataSource.reportTemplateID = cellTemplateData.getReportTemplateID();
dataSource.cellDataID = cellData.getId() + "";
......
......@@ -140,7 +140,7 @@ public class BB extends FunctionBase implements FreeRefFunction {
} finally {
LOGGER.warn("error for bb cacls for {} and current for {}", bo.toString(), curPeriod.toString());
Long dataSourceID = saveDataSource(ec, ds, FormulaDataSourceDetailType.ReportCellDataSourceDto,
cellValue, formulaContext.getPeriod(), formulaContext.getReportTemplateGroupID(),bo.getColumnIndex(),bo.getRowIndex());
cellValue, formulaContext.getPeriod(), formulaContext.getReportTemplateGroupID(),bo.getColumnIndex()-1,bo.getRowIndex()-1);
saveFormulaBlock(formulaContext.getPeriod(), ec, bo.expression(curPeriod.getCurPeriod(), curPeriod.getCurYear()), cellValue, dataSourceID);
}
}
......
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