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
b86731a9
Commit
b86731a9
authored
May 31, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目划转
parent
e8fe8c90
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
35 deletions
+38
-35
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+38
-35
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
b86731a9
...
...
@@ -480,7 +480,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
if
(
Common
.
isEmpty
(
oldEmpProject
.
getSocialStatus
())
||
CommonConstants
.
ZERO_INT
==
oldEmpProject
.
getSocialStatus
()){
resStr
.
append
(
"社保项不存在,无法划转! <br>"
);
}
}
else
{
if
(
Common
.
isEmpty
(
newEmpProject
.
getSocialStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getSocialStatus
()){
newEmpProject
.
setSocialStatus
(
oldEmpProject
.
getSocialStatus
());
...
...
@@ -498,12 +498,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
resStr
.
append
(
"目标项目档案存在社保数据,社保划转失败! <br>"
);
}
}
}
// 处理公积金 如果目标项目档案已存在公积金 不划转
if
(
vo
.
getChangeItems
().
indexOf
(
CommonConstants
.
TWO_STRING
)
>=
CommonConstants
.
ZERO_INT
)
{
if
(
Common
.
isEmpty
(
oldEmpProject
.
getFundStatus
())
||
CommonConstants
.
ZERO_INT
==
oldEmpProject
.
getFundStatus
()){
resStr
.
append
(
"公积金项不存在,无法划转! <br>"
);
}
}
else
{
if
(
Common
.
isEmpty
(
newEmpProject
.
getFundStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getFundStatus
()){
newEmpProject
.
setFundStatus
(
oldEmpProject
.
getFundStatus
());
...
...
@@ -515,12 +516,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
resStr
.
append
(
"目标项目档案存在公积金数据,公积金划转失败! <br>"
);
}
}
}
// 处理員工合同 目标 已有合同状态 不在处理合同划转
if
(
vo
.
getChangeItems
().
indexOf
(
CommonConstants
.
ZERO_STRING
)
>=
CommonConstants
.
ZERO_INT
){
if
(
Common
.
isEmpty
(
oldEmpProject
.
getContractStatus
())
||
CommonConstants
.
ZERO_INT
==
oldEmpProject
.
getContractStatus
()){
resStr
.
append
(
"员工合同不存在,无法划转! <br>"
);
}
}
else
{
if
(
Common
.
isEmpty
(
newEmpProject
.
getContractStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getContractStatus
()){
newEmpProject
.
setContractStatus
(
oldEmpProject
.
getContractStatus
());
...
...
@@ -533,6 +535,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
resStr
.
append
(
"目标项目档案存在员工合同数据,员工合同划转失败! <br>"
);
}
}
}
// 变更老的项目档案
tEmployeeProjectService
.
updateChangeById
(
oldEmpProject
);
//新增或变更新的项目档案
...
...
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