Commit 7eb1e3c8 authored by neo's avatar neo

[dev] bb for same sheet dependence

parent 3f595472
...@@ -78,15 +78,21 @@ public class BB extends FunctionBase implements FreeRefFunction { ...@@ -78,15 +78,21 @@ public class BB extends FunctionBase implements FreeRefFunction {
} }
return returnEval; return returnEval;
} else if (bo.getPeriod().intValue() == 0) {
cellValue = new BigDecimal(ec.getWorkbook().getSheet(ec.getWorkbook().getSheetIndex(bo.getReportCode()))
.getCell(bo.getRowIndex(), bo.getColumnIndex()).getNumericCellValue());
return cellValue;
} }
bo.disCount(); bo.disCount();
CellData cellData = null;
String dbName = agent.getPastProjectDbName(curPeriod.getCurYear(), String dbName = agent.getPastProjectDbName(curPeriod.getCurYear(),
formulaContext.getOrganizationID()); formulaContext.getOrganizationID());
MyAsserts.assertNotEmpty(dbName, Exceptions.BB_EMPTY); MyAsserts.assertNotEmpty(dbName, Exceptions.BB_EMPTY);
String currentProjectDb = ShardingContextHolder.getDataSourceKey(); String currentProjectDb = ShardingContextHolder.getDataSourceKey();
CellData cellData = null;
if (currentProjectDb.equals(dbName)) { if (currentProjectDb.equals(dbName)) {
cellData = agent.getCellData(cellTemplateData.getReportTemplateID(), cellData = agent.getCellData(cellTemplateData.getReportTemplateID(),
cellTemplateData.getCellTemplateID(), curPeriod.getCurPeriod()); cellTemplateData.getCellTemplateID(), curPeriod.getCurPeriod());
......
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