From c4b17974ae482c39ebdd0cbb8c1af87f978dbd8e Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 7 Dec 2022 15:21:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=BD=92=E6=A1=A3=EF=BC=8C=E8=96=AA?= =?UTF-8?q?=E8=B5=84=E6=A0=B8=E7=AE=97=E4=B8=8D=E5=AD=98=E5=9C=A8BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SalaryAcctRecordServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index 816a840bc..420e8062b 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -525,15 +525,16 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe if (CollectionUtils.isEmpty(salaryAcctResultPOS)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(99691, "尚未核算，请先核算后再归档")); } - - // 生成工资单 - getSalarySendService(user).generateSalaryBill(salaryAcctRecordId); - // 更新薪资核算记录的状态 salaryAcctRecordPO.setStatus(SalaryAcctRecordStatusEnum.ARCHIVED.getValue()); salaryAcctRecordPO.setUpdateTime(new Date()); getSalaryAcctRecordMapper().updateIgnoreNull(salaryAcctRecordPO); + // 生成工资单 + getSalarySendService(user).generateSalaryBill(salaryAcctRecordId); + + + // 记录日志 // String targetName = getLogTargetNameById(salaryAcctRecordId); // LoggerContext loggerContext = new LoggerContext<>();