Commit 533b0353 authored by neo's avatar neo

[Bugfix] fixed bb expression use bb not pct

parent 75d1ddde
...@@ -118,20 +118,6 @@ public class BBParasBo { ...@@ -118,20 +118,6 @@ public class BBParasBo {
return formulaExpression; return formulaExpression;
} }
public String expressionData() {
if (!expressionData.isEmpty()) {
StringBuilder builder = new StringBuilder("PCT(");
for (int i = 0; i < expressionData.size(); i++) {
builder.append(expressionData.get(i).toString());
if (i < expressionData.size() - 1)
builder.append(",");
}
builder.append(")");
return builder.toString();
}
return "0";
}
@Override @Override
public String toString() { public String toString() {
return "BBParasBo{" + return "BBParasBo{" +
......
...@@ -160,7 +160,7 @@ public class BB extends FunctionBase implements FreeRefFunction { ...@@ -160,7 +160,7 @@ public class BB extends FunctionBase implements FreeRefFunction {
formulaContext.getReportTemplateGroupId(), bo.getColumnIndex() - 1, bo.getRowIndex() - 1, formulaContext.getReportTemplateGroupId(), bo.getColumnIndex() - 1, bo.getRowIndex() - 1,
formulaContext.getProjectId()); formulaContext.getProjectId());
saveFormulaBlock(formulaContext.getPeriod(), ec, saveFormulaBlock(formulaContext.getPeriod(), ec,
bo.expression(), bo.expressionData(), dataSourceId, formulaContext.getProjectId()); bo.expression(), bo.expression(), dataSourceId, formulaContext.getProjectId());
} }
} }
} }
......
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