核算日志
This commit is contained in:
parent
784399a936
commit
86e3214d8e
|
|
@ -49,7 +49,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
|
|||
|
||||
private String runSQL(ExpressFormula expressFormula, List<FormulaVar> formulaVars) {
|
||||
if (isLog) {
|
||||
log.info("SQL ExpressFormula {}, formulaVars {}", expressFormula, formulaVars);
|
||||
log.info("SQL ExpressFormula {}", expressFormula);
|
||||
}
|
||||
|
||||
//解析配置,获取返回值、数据源
|
||||
|
|
@ -81,7 +81,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
|
|||
sql = sql.replaceAll(formulaVar.getFieldId(), "'" + formulaVar.getContent() + "'");
|
||||
}
|
||||
if (isLog) {
|
||||
log.info("sql run {}", sql);
|
||||
log.info("ExpressFormula sql run {}", sql);
|
||||
}
|
||||
|
||||
//外部数据源
|
||||
|
|
@ -105,10 +105,13 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
|
|||
|
||||
private Object runFormula(ExpressFormula expressFormula, List<FormulaVar> formulaVars) throws Exception {
|
||||
if (isLog) {
|
||||
log.info("FORMULA ExpressFormula {}, formulaVars {}", expressFormula, formulaVars);
|
||||
log.info("FORMULA ExpressFormula {} {}", expressFormula.getFormula(), expressFormula.getFormulaRunScript());
|
||||
}
|
||||
DefaultContext<String, Object> context = new DefaultContext<String, Object>();
|
||||
formulaVars.forEach(v -> {
|
||||
if (isLog) {
|
||||
log.info("FORMULA formulaVar {} - {}", v.getFieldId(), v.getContent());
|
||||
}
|
||||
if (DataType.NUMBER.equals(v.getFieldType()) && NumberUtils.isCreatable(v.getContent())) {
|
||||
context.put(v.getFieldId(), new BigDecimal(v.getContent()));
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in New Issue