Commit 39672063 authored by hongguangwu's avatar hongguangwu

1.5.6-salaryBack-EKP退表,异步、记录异常

parent 81165eef
...@@ -844,8 +844,9 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -844,8 +844,9 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
if (salaryList != null && !salaryList.isEmpty()) { if (salaryList != null && !salaryList.isEmpty()) {
TSalaryStandard ss = salaryList.get(0); TSalaryStandard ss = salaryList.get(0);
if (ss.getStatus() != SalaryConstants.STATUS[6]) { if (ss.getStatus() != SalaryConstants.STATUS[6]) {
YifuUser user = SecurityUtils.getUser();
// 异步-收入相关 // 异步-收入相关
doSalaryAsync.doBackSalary(applyNo, ss); doSalaryAsync.doBackSalary(applyNo, ss, user);
return R.ok(); return R.ok();
} else { } else {
return R.failed("工资表已退回,请不要重复操作"); return R.failed("工资表已退回,请不要重复操作");
......
...@@ -226,12 +226,11 @@ public class DoJointSalaryAsyncTask { ...@@ -226,12 +226,11 @@ public class DoJointSalaryAsyncTask {
* @return: void * @return: void
**/ **/
@Async @Async
public void doBackSalary(String applyNo, TSalaryStandard ss) { public void doBackSalary(String applyNo, TSalaryStandard ss, YifuUser user) {
EkpSalaryBackParam param = new EkpSalaryBackParam(); EkpSalaryBackParam param = new EkpSalaryBackParam();
param.setFd_3b3c293745e7b4(ss.getDeptName()); param.setFd_3b3c293745e7b4(ss.getDeptName());
param.setFd_3b3c2935c13056(ss.getDeptNo()); param.setFd_3b3c2935c13056(ss.getDeptNo());
param.setFd_3b3c293811c0ee(ss.getApplyNo()); param.setFd_3b3c293811c0ee(ss.getApplyNo());
YifuUser user = SecurityUtils.getUser();
if (user != null) { if (user != null) {
param.setFd_3b422d73d73e02(user.getUsername()); param.setFd_3b422d73d73e02(user.getUsername());
} else { } else {
......
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