Commit 8587d463 authored by hongguangwu's avatar hongguangwu

薪资审核优化

parent 46f17f9b
...@@ -10,6 +10,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties; ...@@ -10,6 +10,7 @@ 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.salary.entity.TSalaryAccount; 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.service.TSalaryStandardService; import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardService;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail; import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo;
...@@ -34,7 +35,7 @@ import java.util.*; ...@@ -34,7 +35,7 @@ import java.util.*;
public class DoJointSalaryAsyncTask { public class DoJointSalaryAsyncTask {
private final DaprSocialProperties socialProperties; private final DaprSocialProperties socialProperties;
private final TSalaryStandardService tSalaryStandardService; private final TSalaryStandardMapper salaryStandardMapper;
/** /**
* @Description: 收入 * @Description: 收入
...@@ -52,7 +53,7 @@ public class DoJointSalaryAsyncTask { ...@@ -52,7 +53,7 @@ public class DoJointSalaryAsyncTask {
} }
Map<String, Integer> detailMap = new HashMap<>(); Map<String, Integer> detailMap = new HashMap<>();
boolean isTrue = true; boolean isTrue = true;
TSalaryStandard s = tSalaryStandardService.getById(id); TSalaryStandard s = salaryStandardMapper.selectById(id);
try { try {
// 收入相关 // 收入相关
R<String> failed1 = getIncomeDetailMap(tSalaryStandard, dept, idCardList, detailMap); R<String> failed1 = getIncomeDetailMap(tSalaryStandard, dept, idCardList, detailMap);
...@@ -95,10 +96,10 @@ public class DoJointSalaryAsyncTask { ...@@ -95,10 +96,10 @@ public class DoJointSalaryAsyncTask {
tSalaryStandard.setIncomeEndTime(new Date()); tSalaryStandard.setIncomeEndTime(new Date());
if (isTrue) { if (isTrue) {
s.setStatus(CommonConstants.TWO_INT); s.setStatus(CommonConstants.TWO_INT);
tSalaryStandardService.updateById(s); salaryStandardMapper.updateById(s);
} else { } else {
s.setStatus(CommonConstants.dingleDigitIntArray[12]); s.setStatus(CommonConstants.dingleDigitIntArray[12]);
tSalaryStandardService.updateById(s); salaryStandardMapper.updateById(s);
} }
} }
} }
......
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