qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/release/2.9.4.2308.02' into fix/230901-福利核算中处理核算结果逻辑中，查询sql分片

This commit is contained in:
sy 2023-09-06 10:17:41 +08:00
parent d7b9485d18 1451c4b192
commit eb6fed2079
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
View File

@ -155,6 +155,10 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
private ExcelResult runFormula(ExpressFormula expressFormula, List<FormulaVar> formulaVars) {
if (isLog) {
log.info("FORMULA ExpressFormula {} {}", expressFormula.getFormula(), expressFormula.getFormulaRunScript());
}
//是否是自定义函数
boolean isCustomFunction = true;
@ -167,11 +171,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
isCustomFunction = StringUtils.equals(isCustomFunctionNode.asText().trim(), "1");
}
} catch (JsonProcessingException e) {
log.error("express execute fail, sql extendParam parse fail", e);
}
if (isLog) {
log.info("FORMULA ExpressFormula {} {}", expressFormula.getFormula(), expressFormula.getFormulaRunScript());
log.error("express execute fail, extendParam parse fail {}", extendParam, e);
}
String formula = expressFormula.getFormulaRunScript();