Commit 65f47fb2 authored by neo's avatar neo

[bugfix] bb period fixed to content current priod

parent 310b7040
...@@ -37,7 +37,7 @@ public class BB extends FunctionBase implements FreeRefFunction { ...@@ -37,7 +37,7 @@ public class BB extends FunctionBase implements FreeRefFunction {
return wrapExceptionEval(args, ec); return wrapExceptionEval(args, ec);
} catch (Exception e) { } catch (Exception e) {
if (e instanceof FormulaException) if (e instanceof FormulaException)
LOGGER.warn("Formula Exception || ", e); LOGGER.warn("Formula Exception || {}", e.getMessage());
else else
e.printStackTrace(); e.printStackTrace();
return defaultEval; return defaultEval;
...@@ -117,8 +117,8 @@ public class BB extends FunctionBase implements FreeRefFunction { ...@@ -117,8 +117,8 @@ public class BB extends FunctionBase implements FreeRefFunction {
return cellValue; return cellValue;
} finally { } finally {
Long dataSourceID = saveDataSource(ec, ds, FormulaDataSourceDetailType.ReportCellDataSourceDto, Long dataSourceID = saveDataSource(ec, ds, FormulaDataSourceDetailType.ReportCellDataSourceDto,
cellValue, curPeriod.getCurPeriod(), formulaContext.getReportTemplateGroupID()); cellValue, formulaContext.getPeriod(), formulaContext.getReportTemplateGroupID());
saveFormulaBlock(curPeriod.getCurPeriod(), ec, bo.expression(curPeriod.getCurPeriod(), curPeriod.getCurYear()), cellValue, dataSourceID); 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