diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 57354abe9..19ee2b84e 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -351,7 +351,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe if (CollectionUtils.isNotEmpty(salaryAcctResultPOS)) { // 加密 SalaryAcctResultPOEncrypt.encryptList(salaryAcctResultPOS); - getSalaryAcctResultMapper().batchInsert(salaryAcctResultPOS); + List> partition = Lists.partition(salaryAcctResultPOS, 100); + partition.forEach(getSalaryAcctResultMapper()::batchInsert); } // 查询操作日志的targetName String targetName = getSalaryAcctRecordService(user).getLogTargetNameById(salaryAcctEmployeePO.getSalaryAcctRecordId()); @@ -374,7 +375,11 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe @Override public void batchSave(Collection salaryAcctResultPOS) { if (CollectionUtils.isNotEmpty(salaryAcctResultPOS)) { - getSalaryAcctResultMapper().batchInsert(salaryAcctResultPOS); + List list = (List)salaryAcctResultPOS; + // 数据加密 + SalaryAcctResultPOEncrypt.encryptList(list); + List> partition = Lists.partition(list, 100); + partition.forEach(getSalaryAcctResultMapper()::batchInsert); } } @@ -550,8 +555,6 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe } // 保存薪资的薪资核算结果 List salaryAcctResultPOS = SalaryAcctResultBO.convert2ResultPO(salaryAcctResultTempPOS); - // 数据加密 - SalaryAcctResultPOEncrypt.encryptList(salaryAcctResultPOS); batchSave(salaryAcctResultPOS); // 删除薪资核算临时存储表中的数据 getSalaryAcctResultTempService(user).deleteByCalculateKey(calculateKey); diff --git a/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java b/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java index c1357b08a..ee74cd25f 100644 --- a/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java @@ -212,23 +212,23 @@ public class SalaryFormulaServiceImpl extends Service implements SalaryFormulaSe po.setContent(String.valueOf(i + 1)); } //验证公式是否可运行 -// if (ReferenceTypeEnum.parseByValue(param.getReferenceType()) == ReferenceTypeEnum.FORMULA) { - ExpressFormula test = ExpressFormula.builder().formulaRunScript(formulaRunScript).extendParam(param.getExtendParam()).referenceType(param.getReferenceType()).build(); - Object run = null; - try { - run = getFormulaRunService(user).run(test, parameters, DataCollectionEmployee.builder().employeeId((long) user.getUID()).build()); - } catch (Exception e) { - log.error("express execute fail ", e); - throw new SalaryRunTimeException("公式运行出错," + e.getCause()); - } + if (ReferenceTypeEnum.parseByValue(param.getReferenceType()) == ReferenceTypeEnum.FORMULA) { + ExpressFormula test = ExpressFormula.builder().formulaRunScript(formulaRunScript).extendParam(param.getExtendParam()).referenceType(param.getReferenceType()).build(); + Object run = null; + try { + run = getFormulaRunService(user).run(test, parameters, DataCollectionEmployee.builder().employeeId((long) user.getUID()).build()); + } catch (Exception e) { + log.error("express execute fail ", e); + throw new SalaryRunTimeException("公式运行出错," + e.getCause()); + } - if (run != null && StringUtils.isNotBlank(String.valueOf(run)) && returnTypeEnum == ReturnTypeEnum.NUMBER) { - //返回结果不是数字 - if (!NumberUtils.isCreatable(String.valueOf(run))) { - throw new SalaryRunTimeException("返回结果不是数值"); + if (run != null && StringUtils.isNotBlank(String.valueOf(run)) && returnTypeEnum == ReturnTypeEnum.NUMBER) { + //返回结果不是数字 + if (!NumberUtils.isCreatable(String.valueOf(run))) { + throw new SalaryRunTimeException("返回结果不是数值"); + } } } -// } }