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
2e896a8e
Commit
2e896a8e
authored
Jul 05, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6
parents
bb07037a
78355e52
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
1 deletion
+21
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+21
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
2e896a8e
...
...
@@ -749,6 +749,26 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeInfo
.
setContractStatus
(
CommonConstants
.
ONE_INT
);
tEmployeeInfoMapper
.
updateById
(
tEmployeeInfo
);
}
//签订类型正常签订的时候更新预入职列表
if
(
EmployeeConstants
.
SITUATION_ONE
.
equals
(
contractInfo
.
getSituation
()))
{
//根据项目编码和身份证号查询预入职列表
TPreEmpMain
empMain
=
preEmpMainMapper
.
selectOne
(
Wrappers
.<
TPreEmpMain
>
query
()
.
lambda
().
eq
(
TPreEmpMain:
:
getEmpIdcard
,
contractInfo
.
getEmpIdcard
())
.
eq
(
TPreEmpMain:
:
getDeptNo
,
contractInfo
.
getDeptNo
()));
if
(
Optional
.
ofNullable
(
empMain
).
isPresent
())
{
//查询预入职项目档案表
TPreEmployeeProject
preEmployeeProject
=
preEmployeeProjectMapper
.
selectOne
(
Wrappers
.<
TPreEmployeeProject
>
query
()
.
lambda
().
eq
(
TPreEmployeeProject:
:
getPreMainId
,
empMain
.
getId
()));
if
(
Optional
.
ofNullable
(
preEmployeeProject
).
isPresent
())
{
preEmployeeProject
.
setContractType
(
contractInfo
.
getContractType
());
preEmployeeProject
.
setWorkingHours
(
contractInfo
.
getWorkingHours
());
preEmployeeProject
.
setPost
(
contractInfo
.
getPost
());
preEmployeeProject
.
setEnjoinDate
(
contractInfo
.
getContractStart
());
preEmployeeProject
.
setTryPeriod
(
contractInfo
.
getTryPeriod
());
preEmployeeProjectMapper
.
updateById
(
preEmployeeProject
);
}
}
}
}
else
{
//是否同步终止合同、减项、减档为是的时候 单独写逻辑
if
(
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
contractInfo
.
getSituation
())
...
...
@@ -1631,7 +1651,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
preEmployeeProject
.
setContractType
(
contract
.
getContractType
());
preEmployeeProject
.
setWorkingHours
(
contract
.
getWorkingHours
());
preEmployeeProject
.
setPost
(
contract
.
getPost
());
preEmployeeProject
.
setEnjoinDate
(
DateUtil
.
stringToDate
(
contract
.
getCreateTimeStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
preEmployeeProject
.
setEnjoinDate
(
contract
.
getContractStart
(
));
preEmployeeProject
.
setTryPeriod
(
contract
.
getTryPeriod
());
preEmployeeProjectMapper
.
updateById
(
preEmployeeProject
);
}
...
...
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