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
90a45159
Commit
90a45159
authored
Nov 26, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.17-离职待办-优化代码
parent
cb5a2739
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
16 deletions
+8
-16
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+8
-16
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
90a45159
...
@@ -1041,7 +1041,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1041,7 +1041,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
// @param isExit: 1仅发起日期为今日及之前的事项 0立即发起(全量)
// @param isExit: 1仅发起日期为今日及之前的事项 0立即发起(全量)
// * @param doType: 需处理项:1社保2公积金3商险4合同5项目档案6人员档案
// * @param doType: 需处理项:1社保2公积金3商险4合同5项目档案6人员档案
private
R
<
List
<
EmployeeRegistrationLeave
>>
batchDoLeaveCore
(
List
<
EmployeeRegistrationLeave
>
leaveList
,
String
isExit
,
String
doType
,
YifuUser
user
)
{
private
R
<
List
<
EmployeeRegistrationLeave
>>
batchDoLeaveCore
(
List
<
EmployeeRegistrationLeave
>
leaveList
,
String
isExit
,
String
doType
,
YifuUser
user
)
{
if
(
Common
.
isEmpty
(
leaveList
))
{
if
(
Common
.
isEmpty
(
leaveList
))
{
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
}
}
...
@@ -1058,7 +1059,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1058,7 +1059,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
List
<
BaseSearchVO
>
listParamProject
=
new
ArrayList
<>();
List
<
BaseSearchVO
>
listParamProject
=
new
ArrayList
<>();
List
<
BaseSearchVO
>
listParamEmp
=
new
ArrayList
<>();
List
<
BaseSearchVO
>
listParamEmp
=
new
ArrayList
<>();
BaseSearchVO
searchVo
;
BaseSearchVO
searchVo
;
int
i
=
0
;
// 离职待办与商险的映射
// 离职待办与商险的映射
Map
<
String
,
List
<
String
>>
leaveInsuranceMap
=
new
HashMap
<>();
Map
<
String
,
List
<
String
>>
leaveInsuranceMap
=
new
HashMap
<>();
// 单一离职待办里的商险
// 单一离职待办里的商险
...
@@ -1066,7 +1066,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1066,7 +1066,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
String
[]
insuranceArr
;
String
[]
insuranceArr
;
String
errorMessage
;
String
errorMessage
;
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
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
)))
...
@@ -1195,12 +1194,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1195,12 +1194,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
}
//组装返回给前端
//组装返回给前端
List
<
ErrorMessage
>
socialParamList
=
new
ArrayList
<>()
;
List
<
ErrorMessage
>
socialParamList
;
List
<
ErrorMessage
>
fundParamList
=
new
ArrayList
<>()
;
List
<
ErrorMessage
>
fundParamList
;
List
<
ErrorMessage
>
insuranceParamList
=
new
ArrayList
<>()
;
List
<
ErrorMessage
>
insuranceParamList
;
List
<
ErrorMessage
>
contractParamList
=
new
ArrayList
<>()
;
List
<
ErrorMessage
>
contractParamList
;
List
<
ErrorMessage
>
projectParamList
=
new
ArrayList
<>()
;
List
<
ErrorMessage
>
projectParamList
;
List
<
ErrorMessage
>
empParamList
=
new
ArrayList
<>()
;
List
<
ErrorMessage
>
empParamList
;
// 社保-完成
// 社保-完成
if
(!
socialOldList
.
isEmpty
())
{
if
(!
socialOldList
.
isEmpty
())
{
TDispatchReduceListVo
paramListVo
=
new
TDispatchReduceListVo
();
TDispatchReduceListVo
paramListVo
=
new
TDispatchReduceListVo
();
...
@@ -1513,13 +1512,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1513,13 +1512,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
}
leaveLogService
.
saveBatch
(
logList
);
leaveLogService
.
saveBatch
(
logList
);
this
.
updateBatchById
(
leaveList
);
this
.
updateBatchById
(
leaveList
);
ErrorInfoVo
errorVo
=
new
ErrorInfoVo
();
errorVo
.
setEmpParamList
(
empParamList
);
errorVo
.
setProjectParamList
(
projectParamList
);
errorVo
.
setContractParamList
(
contractParamList
);
errorVo
.
setSocialParamList
(
socialParamList
);
errorVo
.
setFundParamList
(
fundParamList
);
errorVo
.
setInsuranceParamList
(
insuranceParamList
);
if
(
isReturn
)
{
if
(
isReturn
)
{
return
R
.
failed
(
leaveList
,
"发起失败!"
);
return
R
.
failed
(
leaveList
,
"发起失败!"
);
}
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