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
a9e47e44
Commit
a9e47e44
authored
Jan 15, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.5-薪资提交校验
parent
8278fb86
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+4
-2
DoJointSalaryAsyncTask.java
...loud/plus/v1/yifu/salary/util/DoJointSalaryAsyncTask.java
+8
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
a9e47e44
...
@@ -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
());
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/DoJointSalaryAsyncTask.java
View file @
a9e47e44
...
@@ -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
);
...
...
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