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
ce499548
Commit
ce499548
authored
Nov 24, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.17-离职待办-派单暂存
parent
29d449b3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
43 additions
and
6 deletions
+43
-6
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+43
-6
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
ce499548
...
@@ -1069,7 +1069,15 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1069,7 +1069,15 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
i
++;
i
++;
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
ONE_STRING
))
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
ONE_STRING
))
&&
Common
.
isNotNull
(
leave
.
getSocialDispatchIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
&&
Common
.
isNotNull
(
leave
.
getSocialDispatchIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getSocialExpectedTime
().
isBefore
(
nowTime
))))
{
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getSocialExpectedTime
().
isBefore
(
nowTime
)))
&&
Common
.
isNotNull
(
leave
.
getDoStatusSocial
())
&&
(
leave
.
getDoStatusSocial
().
equals
(
CommonConstants
.
TWO_STRING
)
||
leave
.
getDoStatusSocial
().
equals
(
CommonConstants
.
THREE_STRING
)
||
leave
.
getDoStatusSocial
().
equals
(
CommonConstants
.
SIX_STRING
)
||
leave
.
getDoStatusSocial
().
equals
(
CommonConstants
.
NINE_STRING
)
||
leave
.
getDoStatusSocial
().
equals
(
CommonConstants
.
TEN_STRING
)
)
)
{
leave
.
setFailSocialUser
(
userName
);
leave
.
setFailSocialUser
(
userName
);
vo
=
new
TDispatchReduceVo
();
vo
=
new
TDispatchReduceVo
();
vo
.
setLeaveId
(
leave
.
getId
());
vo
.
setLeaveId
(
leave
.
getId
());
...
@@ -1084,7 +1092,14 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1084,7 +1092,14 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
}
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
TWO_STRING
))
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
TWO_STRING
))
&&
Common
.
isNotNull
(
leave
.
getFundDispatchIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
&&
Common
.
isNotNull
(
leave
.
getFundDispatchIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getFundExpectedTime
().
isBefore
(
nowTime
))))
{
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getFundExpectedTime
().
isBefore
(
nowTime
)))
&&
Common
.
isNotNull
(
leave
.
getDoStatusFund
())
&&
(
leave
.
getDoStatusFund
().
equals
(
CommonConstants
.
TWO_STRING
)
||
leave
.
getDoStatusFund
().
equals
(
CommonConstants
.
THREE_STRING
)
||
leave
.
getDoStatusFund
().
equals
(
CommonConstants
.
NINE_STRING
)
||
leave
.
getDoStatusFund
().
equals
(
CommonConstants
.
TEN_STRING
)
)
)
{
leave
.
setFailFundUser
(
userName
);
leave
.
setFailFundUser
(
userName
);
vo
=
new
TDispatchReduceVo
();
vo
=
new
TDispatchReduceVo
();
vo
.
setLeaveId
(
leave
.
getId
());
vo
.
setLeaveId
(
leave
.
getId
());
...
@@ -1099,7 +1114,13 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1099,7 +1114,13 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
}
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
THREE_STRING
))
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
THREE_STRING
))
&&
Common
.
isNotNull
(
leave
.
getInsuranceIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
&&
Common
.
isNotNull
(
leave
.
getInsuranceIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getInsuranceExpectedTime
().
isBefore
(
nowTime
))))
{
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getInsuranceExpectedTime
().
isBefore
(
nowTime
)))
&&
Common
.
isNotNull
(
leave
.
getDoStatusInsurance
())
&&
(
leave
.
getDoStatusInsurance
().
equals
(
CommonConstants
.
TWO_STRING
)
||
leave
.
getDoStatusInsurance
().
equals
(
CommonConstants
.
THREE_STRING
)
||
leave
.
getDoStatusInsurance
().
equals
(
CommonConstants
.
NINE_STRING
)
)
)
{
insuranceArr
=
leave
.
getInsuranceIdOld
().
split
(
","
);
insuranceArr
=
leave
.
getInsuranceIdOld
().
split
(
","
);
insuranceList
=
new
ArrayList
<>();
insuranceList
=
new
ArrayList
<>();
for
(
String
id
:
insuranceArr
)
{
for
(
String
id
:
insuranceArr
)
{
...
@@ -1110,7 +1131,13 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1110,7 +1131,13 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
}
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
FOUR_STRING
))
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
FOUR_STRING
))
&&
Common
.
isNotNull
(
leave
.
getContractIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
&&
Common
.
isNotNull
(
leave
.
getContractIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getContractExpectedTime
().
isBefore
(
nowTime
))))
{
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getContractExpectedTime
().
isBefore
(
nowTime
)))
&&
Common
.
isNotNull
(
leave
.
getDoStatusContract
())
&&
(
leave
.
getDoStatusContract
().
equals
(
CommonConstants
.
TWO_STRING
)
||
leave
.
getDoStatusContract
().
equals
(
CommonConstants
.
THREE_STRING
)
||
leave
.
getDoStatusContract
().
equals
(
CommonConstants
.
TEN_STRING
)
)
)
{
leave
.
setFailContractUser
(
userName
);
leave
.
setFailContractUser
(
userName
);
searchVo
=
new
BaseSearchVO
();
searchVo
=
new
BaseSearchVO
();
searchVo
.
setSearchKey
(
leave
.
getContractIdOld
());
searchVo
.
setSearchKey
(
leave
.
getContractIdOld
());
...
@@ -1125,7 +1152,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1125,7 +1152,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
}
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
FIVE_STRING
))
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
FIVE_STRING
))
&&
Common
.
isNotNull
(
leave
.
getEmpProjectIdOld
()))
{
&&
Common
.
isNotNull
(
leave
.
getEmpProjectIdOld
())
&&
Common
.
isNotNull
(
leave
.
getDoStatusProject
())
&&
(
leave
.
getDoStatusProject
().
equals
(
CommonConstants
.
TWO_STRING
)
||
leave
.
getDoStatusProject
().
equals
(
CommonConstants
.
NINE_STRING
)
)
)
{
leave
.
setFailEmpUser
(
userName
);
leave
.
setFailEmpUser
(
userName
);
searchVo
=
new
BaseSearchVO
();
searchVo
=
new
BaseSearchVO
();
searchVo
.
setSearchKey
(
leave
.
getEmpProjectIdOld
());
searchVo
.
setSearchKey
(
leave
.
getEmpProjectIdOld
());
...
@@ -1141,7 +1173,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1141,7 +1173,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
listParamProject
.
add
(
searchVo
);
listParamProject
.
add
(
searchVo
);
}
}
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
SIX_STRING
))
if
((
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
SIX_STRING
))
&&
Common
.
isNotNull
(
leave
.
getEmpIdOld
()))
{
&&
Common
.
isNotNull
(
leave
.
getEmpIdOld
())
&&
Common
.
isNotNull
(
leave
.
getDoStatusEmp
())
&&
(
leave
.
getDoStatusEmp
().
equals
(
CommonConstants
.
TWO_STRING
)
||
leave
.
getDoStatusEmp
().
equals
(
CommonConstants
.
NINE_STRING
)
)
)
{
leave
.
setFailEmpProjectUser
(
userName
);
leave
.
setFailEmpProjectUser
(
userName
);
searchVo
=
new
BaseSearchVO
();
searchVo
=
new
BaseSearchVO
();
searchVo
.
setSearchKey
(
leave
.
getEmpProjectIdOld
());
searchVo
.
setSearchKey
(
leave
.
getEmpProjectIdOld
());
...
...
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