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
5e495a05
Commit
5e495a05
authored
Apr 02, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.21-优化预入职
parent
f871bd3c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
44 additions
and
0 deletions
+44
-0
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+44
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
5e495a05
...
...
@@ -2494,6 +2494,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"workingHours"
,
"tryPeriod"
};
Integer
oldDeptContractStatus
=
project
.
getContractStatus
();
Integer
oldDeptSocialStatus
=
project
.
getSocialStatus
();
Integer
oldDeptFundStatus
=
project
.
getFundStatus
();
Integer
oldDeptInsuranceStatus
=
project
.
getInsuranceStatus
();
Integer
oldDeptSocialProvince
=
project
.
getSocialProvince
();
Integer
oldDeptSocialCity
=
project
.
getSocialCity
();
Integer
oldDeptSocialTown
=
project
.
getSocialTown
();
BeanUtil
.
copyProperties
(
tPreEmployeeProject
,
project
,
ignoreProperties
);
if
(
Common
.
isEmpty
(
project
.
getStatus
()))
{
project
.
setStatus
(
CommonConstants
.
ZERO_INT
);
...
...
@@ -2505,6 +2513,24 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 新项目档案塞基本属性
this
.
setNewEmpProjectBaseData
(
project
,
emp
,
dept
,
user
);
}
if
(
Common
.
isNotNull
(
oldDeptContractStatus
)
&&
oldDeptContractStatus
!=
0
)
{
project
.
setContractStatus
(
oldDeptContractStatus
);
}
if
(
Common
.
isNotNull
(
oldDeptSocialStatus
)
&&
oldDeptSocialStatus
!=
0
)
{
project
.
setSocialStatus
(
oldDeptSocialStatus
);
}
if
(
Common
.
isNotNull
(
oldDeptFundStatus
)
&&
oldDeptFundStatus
!=
0
)
{
project
.
setFundStatus
(
oldDeptFundStatus
);
}
if
(
Common
.
isNotNull
(
oldDeptInsuranceStatus
)
&&
oldDeptInsuranceStatus
!=
0
)
{
project
.
setInsuranceStatus
(
oldDeptInsuranceStatus
);
}
// 2026-03-24 段说要不更新社保省市县
if
(
Common
.
isNotNull
(
oldDeptSocialProvince
))
{
project
.
setSocialProvince
(
oldDeptSocialProvince
);
project
.
setSocialCity
(
oldDeptSocialCity
);
project
.
setSocialTown
(
oldDeptSocialTown
);
}
tEmployeeProjectService
.
saveOrUpdate
(
project
);
}
return
project
;
...
...
@@ -2530,6 +2556,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
emp
=
new
TEmployeeInfo
();
}
String
empCode
=
emp
.
getEmpCode
();
// 检查人员档案的合同社保公积金状态,如果不是初始状态则不更新
Integer
oldContractStatus
=
emp
.
getContractStatus
();
Integer
oldSocialStatus
=
emp
.
getSocialStatus
();
Integer
oldFundStatus
=
emp
.
getFundStatus
();
Integer
oldInsuranceStatus
=
emp
.
getInsuranceStatus
();
BeanUtil
.
copyProperties
(
tPreEmployeeInfo
,
emp
,
ID
);
if
(
Common
.
isEmpty
(
emp
.
getEmpCode
())
&&
Common
.
isNotNull
(
empCode
))
{
emp
.
setEmpCode
(
empCode
);
...
...
@@ -2544,6 +2575,19 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
this
.
setNewEmpBaseData
(
emp
,
user
);
}
emp
.
setFileStatus
(
CommonConstants
.
ZERO_INT
);
if
(
Common
.
isNotNull
(
oldContractStatus
)
&&
oldContractStatus
!=
0
)
{
emp
.
setContractStatus
(
oldContractStatus
);
}
if
(
Common
.
isNotNull
(
oldSocialStatus
)
&&
oldSocialStatus
!=
0
)
{
emp
.
setSocialStatus
(
oldSocialStatus
);
}
if
(
Common
.
isNotNull
(
oldFundStatus
)
&&
oldFundStatus
!=
0
)
{
emp
.
setFundStatus
(
oldFundStatus
);
}
if
(
Common
.
isNotNull
(
oldInsuranceStatus
)
&&
oldInsuranceStatus
!=
0
)
{
emp
.
setInsuranceStatus
(
oldInsuranceStatus
);
}
tEmployeeInfoService
.
saveOrUpdate
(
emp
);
return
emp
;
}
...
...
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