Commit a9e47e44 authored by hongguangwu's avatar hongguangwu

MVP1.7.5-薪资提交校验

parent 8278fb86
...@@ -374,8 +374,10 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -374,8 +374,10 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
} }
} }
// 删除不购买商险的关联项 // 删除不购买商险的关联项
tInsuranceUnpurchasePersonSalaryService.deletePersonSalaryBySalaryId(id); if (Common.isNotNull(sf.getIsCheckRisk()) && sf.getIsCheckRisk() == CommonConstants.ONE_INT) {
sf.setIsCheckRisk(CommonConstants.ZERO_INT); tInsuranceUnpurchasePersonSalaryService.deletePersonSalaryBySalaryId(id);
sf.setIsCheckRisk(CommonConstants.ZERO_INT);
}
//6:删除工资表 //6:删除工资表
sf.setDeleteUser(user.getNickname()); sf.setDeleteUser(user.getNickname());
sf.setDeleteDate(new Date()); sf.setDeleteDate(new Date());
......
...@@ -7,7 +7,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*; ...@@ -7,7 +7,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil; import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryBackParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryBackParam;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord; import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
...@@ -15,6 +14,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount; ...@@ -15,6 +14,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard;
import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryStandardMapper; import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryStandardMapper;
import com.yifu.cloud.plus.v1.yifu.salary.service.TApprovalRecordService; import com.yifu.cloud.plus.v1.yifu.salary.service.TApprovalRecordService;
import com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchasePersonSalaryService;
import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountService; import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountService;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome; import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail; import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
...@@ -47,6 +47,8 @@ public class DoJointSalaryAsyncTask { ...@@ -47,6 +47,8 @@ public class DoJointSalaryAsyncTask {
private final TApprovalRecordService auditLogService; private final TApprovalRecordService auditLogService;
private final EkpSalaryUtil ekpSalaryUtil; private final EkpSalaryUtil ekpSalaryUtil;
private final TInsuranceUnpurchasePersonSalaryService tInsuranceUnpurchasePersonSalaryService;
/** /**
* @Description: 收入 * @Description: 收入
...@@ -241,6 +243,11 @@ public class DoJointSalaryAsyncTask { ...@@ -241,6 +243,11 @@ public class DoJointSalaryAsyncTask {
sendBack = ekpSalaryUtil.backStandardToEKP(param); sendBack = ekpSalaryUtil.backStandardToEKP(param);
} }
if (Common.isNotNull(sendBack) && sendBack.length() == 32) { if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
// 删除不购买商险的关联项
if (Common.isNotNull(ss.getIsCheckRisk()) && ss.getIsCheckRisk() == CommonConstants.ONE_INT) {
tInsuranceUnpurchasePersonSalaryService.deletePersonSalaryBySalaryId(ss.getId());
ss.setIsCheckRisk(CommonConstants.ZERO_INT);
}
// 更新薪资为确认不通过 // 更新薪资为确认不通过
ss.setStatus(SalaryConstants.STATUS[6]); ss.setStatus(SalaryConstants.STATUS[6]);
ss.setSendMonth(null); ss.setSendMonth(null);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment