Merge branch 'release/2.15.2.2409.01' into release/个税版本
This commit is contained in:
commit
3f9220e070
|
|
@ -18,6 +18,7 @@ import com.engine.salary.util.JsonUtil;
|
|||
import com.engine.salary.util.SalaryEntityUtil;
|
||||
import com.engine.salary.util.SalaryI18nUtil;
|
||||
import com.engine.salary.util.db.MapperProxyFactory;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import weaver.hrm.User;
|
||||
|
||||
import java.util.*;
|
||||
|
|
@ -171,14 +172,23 @@ public class SalaryAcctSobConfigServiceImpl extends Service implements SalaryAcc
|
|||
}
|
||||
|
||||
@Override
|
||||
public void updateBySalaryAcctRecordId(Long salaryAcctRecordId) {
|
||||
public synchronized void updateBySalaryAcctRecordId(Long salaryAcctRecordId) {
|
||||
SalaryAcctRecordPO salaryAcctRecord = getSalaryAcctRecordService(user).getById(salaryAcctRecordId);
|
||||
if (salaryAcctRecord == null) {
|
||||
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(156474, "参数错误,薪资核算记录不存在或已被删除"));
|
||||
}
|
||||
SalaryAcctSobConfigPO salaryAcctSobConfig = initBySalaryAcctRecord(salaryAcctRecord);
|
||||
|
||||
String acctSobConfigFlag = getSalaryCacheService(user).get(SalaryCacheKey.ACCT_SOB_CONFIG + salaryAcctRecordId);
|
||||
if (acctSobConfigFlag != null && StringUtils.equals(acctSobConfigFlag, "TRUE")) {
|
||||
return;
|
||||
}
|
||||
getSalaryCacheService(user).set(SalaryCacheKey.ACCT_SOB_CONFIG + salaryAcctRecordId, "TRUE");
|
||||
|
||||
deleteBySalaryAcctRecordIds(Collections.singleton(salaryAcctRecordId));
|
||||
getSalaryAcctSobConfigMapper().insertIgnoreNull(salaryAcctSobConfig);
|
||||
|
||||
getSalaryCacheService(user).set(SalaryCacheKey.ACCT_SOB_CONFIG + salaryAcctRecordId, "FALSE");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Reference in New Issue