Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
39672063
Commit
39672063
authored
Aug 03, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.5.6-salaryBack-EKP退表,异步、记录异常
parent
81165eef
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+2
-1
DoJointSalaryAsyncTask.java
...loud/plus/v1/yifu/salary/util/DoJointSalaryAsyncTask.java
+1
-2
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
39672063
...
@@ -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
(
"工资表已退回,请不要重复操作"
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/DoJointSalaryAsyncTask.java
View file @
39672063
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment