From 0ac2fd248e2887e85996e7d2023a8d6edf020d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 31 Aug 2023 16:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=85=A2sql=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/prop/hrmSalaryCustom.properties | 2 +- src/com/engine/salary/service/impl/FormulaRunServiceImpl.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/resource/WEB-INF/prop/hrmSalaryCustom.properties b/resource/WEB-INF/prop/hrmSalaryCustom.properties index 6294cc5c3..b873bc15e 100644 --- a/resource/WEB-INF/prop/hrmSalaryCustom.properties +++ b/resource/WEB-INF/prop/hrmSalaryCustom.properties @@ -1 +1 @@ -formulaRunOvertimeThreshold= \ No newline at end of file +formulaRunOvertimeThreshold=10 \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java index 37e8207b4..615c148eb 100644 --- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java +++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java @@ -48,7 +48,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService @Override public ExcelResult run(ExpressFormula expressFormula, List formulaVars, DataCollectionEmployee simpleEmployee) { - ExcelResult result = new ExcelResult(false, "", ""); + ExcelResult result = new ExcelResult(false, "", "公式类型异常！"); if (StringUtils.isNotBlank(formulaRunOvertimeThreshold)) { StopWatch stopWatch = new StopWatch(); stopWatch.start("run " + expressFormula.getName()); @@ -69,7 +69,6 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService result = runSQL(expressFormula, formulaVars); } } - log.error("express execute fail, {} not in ReferenceTypeEnum ", expressFormula.getReferenceType()); return result; }