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
7c6e9199
Commit
7c6e9199
authored
Nov 29, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.17-离职待办-优化代码
parent
746abc42
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
91 additions
and
62 deletions
+91
-62
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+91
-62
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
7c6e9199
...
@@ -591,6 +591,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -591,6 +591,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
return
R
.
failed
(
"无需处理原因超过200字!"
);
return
R
.
failed
(
"无需处理原因超过200字!"
);
}
}
if
(
leave
!=
null
)
{
if
(
leave
!=
null
)
{
BaseSearchVO
returnVo
;
BaseSearchVO
paramVo
=
new
BaseSearchVO
();
paramVo
.
setEmpIdCard
(
registration
.
getEmpIdcard
());
paramVo
.
setDeptNo
(
registration
.
getDeptNo
());
StringBuilder
errorInfo
=
new
StringBuilder
();
StringBuilder
errorInfo
=
new
StringBuilder
();
StringBuilder
logInfo
=
new
StringBuilder
(
"手动关闭:"
);
StringBuilder
logInfo
=
new
StringBuilder
(
"手动关闭:"
);
if
(
Common
.
isNotNull
(
doTypeWu
))
{
if
(
Common
.
isNotNull
(
doTypeWu
))
{
...
@@ -611,9 +616,22 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -611,9 +616,22 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
&&
!
CommonConstants
.
EIGHT_STRING
.
equals
(
leave
.
getDoStatusEmp
()))
{
&&
!
CommonConstants
.
EIGHT_STRING
.
equals
(
leave
.
getDoStatusEmp
()))
{
leave
.
setCloseRemarkEmp
(
remark
);
leave
.
setCloseRemarkEmp
(
remark
);
leave
.
setDoStatusEmp
(
CommonConstants
.
ONE_STRING
);
leave
.
setDoStatusEmp
(
CommonConstants
.
ONE_STRING
);
String
isMultipleDept
=
CommonConstants
.
ZERO_STRING
;
R
<
BaseSearchVO
>
returnR
=
archivesDaprUtil
.
getEmpAndContractStatus
(
paramVo
);
if
(
null
!=
returnR
&&
Common
.
isNotNull
(
returnR
.
getData
()))
{
returnVo
=
returnR
.
getData
();
if
(
Common
.
isNotNull
(
returnVo
.
getResultIdFour
()))
{
isMultipleDept
=
returnVo
.
getResultIdFour
();
}
}
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
isMultipleDept
))
{
errorInfo
.
append
(
"人员当下非多项目,不可无需处理!"
);
}
}
else
{
}
else
{
errorInfo
.
append
(
"人员档案状态已完结,不可无需处理!"
);
errorInfo
.
append
(
"人员档案状态已完结,不可无需处理!"
);
}
}
}
}
}
}
if
(
Common
.
isNotNull
(
doTypeYi
))
{
if
(
Common
.
isNotNull
(
doTypeYi
))
{
...
@@ -621,10 +639,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -621,10 +639,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
logInfo
.
append
(
"已在其他入口处理:"
);
logInfo
.
append
(
"已在其他入口处理:"
);
String
socialDispatchId
=
""
;
String
socialDispatchId
=
""
;
String
fundDispatchId
=
""
;
String
fundDispatchId
=
""
;
BaseSearchVO
returnVo
;
BaseSearchVO
paramVo
=
new
BaseSearchVO
();
paramVo
.
setEmpIdCard
(
registration
.
getEmpIdcard
());
paramVo
.
setDeptNo
(
registration
.
getDeptNo
());
R
<
BaseSearchVO
>
returnR
=
socialDaprUtils
.
getSocialAndFundStatusByClose
(
paramVo
);
R
<
BaseSearchVO
>
returnR
=
socialDaprUtils
.
getSocialAndFundStatusByClose
(
paramVo
);
if
(
null
!=
returnR
&&
Common
.
isNotNull
(
returnR
.
getData
()))
{
if
(
null
!=
returnR
&&
Common
.
isNotNull
(
returnR
.
getData
()))
{
returnVo
=
returnR
.
getData
();
returnVo
=
returnR
.
getData
();
...
@@ -917,6 +931,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -917,6 +931,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave
.
setDoStatusInsurance
(
CommonConstants
.
TWO_STRING
);
leave
.
setDoStatusInsurance
(
CommonConstants
.
TWO_STRING
);
}
else
{
}
else
{
this
.
removeInsuranceToDoType
(
leave
);
this
.
removeInsuranceToDoType
(
leave
);
leave
.
setDoStatusInsurance
(
CommonConstants
.
ONE_STRING
);
}
}
}
}
// 停缴社保日期
// 停缴社保日期
...
@@ -1404,78 +1419,92 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1404,78 +1419,92 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
}
// 项目-完成
// 项目-完成
if
(!
listParamProject
.
isEmpty
())
{
if
(!
listParamProject
.
isEmpty
())
{
BaseSearchListVO
paramVoProject
=
new
BaseSearchListVO
();
projectParamList
=
new
ArrayList
<>();
paramVoProject
.
setUserId
(
user
.
getId
());
List
<
BaseSearchVO
>
tempProject
;
paramVoProject
.
setUserName
(
user
.
getNickname
());
BaseSearchListVO
paramVoProject
;
paramVoProject
.
setListParam
(
listParamProject
);
for
(
BaseSearchVO
proVo
:
listParamProject
)
{
R
<
BaseSearchListVO
>
listR
=
archivesDaprUtil
.
leaveToReduceProject
(
paramVoProject
);
tempProject
=
new
ArrayList
<>();
if
(
Common
.
isNotNull
(
listR
)
&&
Common
.
isNotNull
(
listR
.
getData
()))
{
tempProject
.
add
(
proVo
);
// 部分失败
paramVoProject
=
new
BaseSearchListVO
();
if
(!
listR
.
getData
().
getErrorMessageList
().
isEmpty
())
{
paramVoProject
.
setUserId
(
user
.
getId
());
paramVoProject
.
setUserName
(
user
.
getNickname
());
paramVoProject
.
setListParam
(
tempProject
);
R
<
BaseSearchListVO
>
listR
=
archivesDaprUtil
.
leaveToReduceProject
(
paramVoProject
);
if
(
Common
.
isNotNull
(
listR
)
&&
Common
.
isNotNull
(
listR
.
getData
())
&&
!
listR
.
getData
().
getErrorMessageList
().
isEmpty
())
{
projectParamList
=
listR
.
getData
().
getErrorMessageList
();
projectParamList
=
listR
.
getData
().
getErrorMessageList
();
Map
<
String
,
String
>
errorMap
=
new
HashMap
<>();
}
for
(
ErrorMessage
message
:
projectParamList
)
{
}
errorMap
.
put
(
message
.
getKey
(),
message
.
getMessage
());
if
(!
projectParamList
.
isEmpty
())
{
}
Map
<
String
,
String
>
errorMap
=
new
HashMap
<>();
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
for
(
ErrorMessage
message
:
projectParamList
)
{
if
(
judgeToUpdateProject
(
doType
,
leave
)
)
{
errorMap
.
put
(
message
.
getKey
(),
message
.
getMessage
());
if
(
errorMap
.
get
(
leave
.
getId
())
!=
null
)
{
}
errorMessage
=
errorMap
.
get
(
leave
.
getId
());
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
if
(
Common
.
isNotNull
(
errorMessage
)
&&
errorMessage
.
length
()
>
300
)
{
if
(
judgeToUpdateProject
(
doType
,
leave
))
{
errorMessage
=
errorMessage
.
substring
(
0
,
300
);
if
(
errorMap
.
get
(
leave
.
getId
())
!=
null
)
{
}
errorMessage
=
errorMap
.
get
(
leave
.
getId
());
leave
.
setFailEmpProjectRemark
(
errorMessage
);
if
(
Common
.
isNotNull
(
errorMessage
)
&&
errorMessage
.
length
()
>
300
)
{
leave
.
setFailEmpProjectTime
(
LocalDateTime
.
now
());
errorMessage
=
errorMessage
.
substring
(
0
,
300
);
leave
.
setDoStatusProject
(
CommonConstants
.
NINE_STRING
);
}
}
leave
.
setFailEmpProjectRemark
(
errorMessage
);
leave
.
setFailEmpProjectTime
(
LocalDateTime
.
now
());
leave
.
setDoStatusProject
(
CommonConstants
.
NINE_STRING
);
}
}
}
}
}
else
{
}
// 全部成功
}
else
{
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
// 全部成功
if
(
judgeToUpdateProject
(
doType
,
leave
)
)
{
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
leave
.
setEmpProjectId
(
leave
.
getEmpProjectIdOld
());
if
(
judgeToUpdateProject
(
doType
,
leave
))
{
leave
.
setDoStatusProject
(
CommonConstants
.
EIGHT_STRING
);
leave
.
setEmpProjectId
(
leave
.
getEmpProjectIdOld
()
);
}
leave
.
setDoStatusProject
(
CommonConstants
.
EIGHT_STRING
);
}
}
}
}
}
}
}
}
// 员工-完成
// 员工-完成
if
(!
listParamEmp
.
isEmpty
())
{
if
(!
listParamEmp
.
isEmpty
())
{
BaseSearchListVO
paramVoEmp
=
new
BaseSearchListVO
();
paramVoEmp
.
setUserId
(
user
.
getId
());
empParamList
=
new
ArrayList
<>();
paramVoEmp
.
setUserName
(
user
.
getNickname
());
List
<
BaseSearchVO
>
tempEmp
;
paramVoEmp
.
setListParam
(
listParamEmp
);
BaseSearchListVO
paramVoEmp
;
R
<
BaseSearchListVO
>
listR
=
archivesDaprUtil
.
leaveToReduceEmp
(
paramVoEmp
);
for
(
BaseSearchVO
empVo
:
listParamEmp
)
{
if
(
Common
.
isNotNull
(
listR
)
&&
Common
.
isNotNull
(
listR
.
getData
()))
{
// 部分失败
tempEmp
=
new
ArrayList
<>();
if
(!
listR
.
getData
().
getErrorMessageList
().
isEmpty
())
{
tempEmp
.
add
(
empVo
);
paramVoEmp
=
new
BaseSearchListVO
();
paramVoEmp
.
setUserId
(
user
.
getId
());
paramVoEmp
.
setUserName
(
user
.
getNickname
());
paramVoEmp
.
setListParam
(
tempEmp
);
R
<
BaseSearchListVO
>
listR
=
archivesDaprUtil
.
leaveToReduceEmp
(
paramVoEmp
);
if
(
Common
.
isNotNull
(
listR
)
&&
Common
.
isNotNull
(
listR
.
getData
())
&&
!
listR
.
getData
().
getErrorMessageList
().
isEmpty
())
{
empParamList
=
listR
.
getData
().
getErrorMessageList
();
empParamList
=
listR
.
getData
().
getErrorMessageList
();
Map
<
String
,
String
>
errorMap
=
new
HashMap
<>();
}
for
(
ErrorMessage
message
:
empParamList
)
{
}
errorMap
.
put
(
message
.
getKey
(),
message
.
getMessage
());
if
(!
empParamList
.
isEmpty
())
{
}
Map
<
String
,
String
>
errorMap
=
new
HashMap
<>();
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
for
(
ErrorMessage
message
:
empParamList
)
{
if
(
judgeToUpdateEmp
(
doType
,
leave
)
)
{
errorMap
.
put
(
message
.
getKey
(),
message
.
getMessage
());
if
(
errorMap
.
get
(
leave
.
getId
())
!=
null
)
{
}
errorMessage
=
errorMap
.
get
(
leave
.
getId
());
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
if
(
Common
.
isNotNull
(
errorMessage
)
&&
errorMessage
.
length
()
>
300
)
{
if
(
judgeToUpdateEmp
(
doType
,
leave
))
{
errorMessage
=
errorMessage
.
substring
(
0
,
300
);
if
(
errorMap
.
get
(
leave
.
getId
())
!=
null
)
{
}
errorMessage
=
errorMap
.
get
(
leave
.
getId
());
leave
.
setFailEmpRemark
(
errorMessage
);
if
(
Common
.
isNotNull
(
errorMessage
)
&&
errorMessage
.
length
()
>
300
)
{
leave
.
setFailEmpTime
(
LocalDateTime
.
now
());
errorMessage
=
errorMessage
.
substring
(
0
,
300
);
leave
.
setDoStatusEmp
(
CommonConstants
.
NINE_STRING
);
}
}
leave
.
setFailEmpRemark
(
errorMessage
);
leave
.
setFailEmpTime
(
LocalDateTime
.
now
());
leave
.
setDoStatusEmp
(
CommonConstants
.
NINE_STRING
);
}
}
}
}
}
else
{
}
// 全部成功
}
else
{
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
// 全部成功
if
(
judgeToUpdateEmp
(
doType
,
leave
)
)
{
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
leave
.
setEmpId
(
leave
.
getEmpIdOld
());
if
(
judgeToUpdateEmp
(
doType
,
leave
))
{
leave
.
setDoStatusEmp
(
CommonConstants
.
EIGHT_STRING
);
leave
.
setEmpId
(
leave
.
getEmpIdOld
()
);
}
leave
.
setDoStatusEmp
(
CommonConstants
.
EIGHT_STRING
);
}
}
}
}
}
}
...
...
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