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
6ca89e82
Commit
6ca89e82
authored
Mar 04, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同续签待办-fxj
parent
46d11022
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
33 additions
and
0 deletions
+33
-0
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+33
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
6ca89e82
...
@@ -283,6 +283,10 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -283,6 +283,10 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
pre
.
setOverFlag
(
CommonConstants
.
ONE_STRING
);
pre
.
setOverFlag
(
CommonConstants
.
ONE_STRING
);
pre
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
pre
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
}
}
String
errorInfo
=
initDateInfo
(
pre
,
contract
);
if
(
null
!=
errorInfo
){
return
R
.
failed
(
errorInfo
);
}
int
res
=
-
1
;
int
res
=
-
1
;
if
(
Common
.
isNotNull
(
pre
.
getId
())){
if
(
Common
.
isNotNull
(
pre
.
getId
())){
res
=
baseMapper
.
updateById
(
pre
);
res
=
baseMapper
.
updateById
(
pre
);
...
@@ -620,7 +624,36 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -620,7 +624,36 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
//更新岗位名称
//更新岗位名称
return
null
;
return
null
;
}
}
private
String
initDateInfo
(
TEmployeeContractPreNew
preVo
,
TEmployeeContractInfo
contract
)
{
TEmployeeContractDateVo
vo
;
//标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同
//1:"标准合同,3:“劳务协议”,5:“实习协议,8:“非全日制’,9:"补贴合同,13:’见习协议,18:“兼职协议”,19:”临时聘用合同,20:"劳务派遣合同’,21:’其他
if
(
CommonConstants
.
FIVE_STRING
.
equals
(
preVo
.
getContractType
())){
//处理实习协议
preVo
.
setContractStart
(
preVo
.
getInternshipPeriodStart
());
preVo
.
setContractEnd
(
preVo
.
getInternshipPeriodEnd
());
}
if
(
Common
.
isNotNull
(
preVo
.
getInternshipPeriodStart
())
&&
Common
.
isNotNull
(
preVo
.
getInternshipPeriodEnd
())){
if
(
preVo
.
getInternshipPeriodEnd
().
before
(
preVo
.
getInternshipPeriodStart
())){
return
"实习结束日期需大于等于实习开始日期"
;
}
}
//同商务合同一直 要 验证时间 截止时间大于等于开始时间、时间交叉
if
(
Common
.
isNotNull
(
preVo
.
getContractStart
())
&&
Common
.
isNotNull
(
preVo
.
getContractEnd
())){
if
(
preVo
.
getContractEnd
().
before
(
preVo
.
getContractStart
())){
return
"合同截止日期需大于等于合同开始日期"
;
}
}
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodStart
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodEnd
())){
if
(
preVo
.
getDispatchPeriodEnd
().
before
(
preVo
.
getDispatchPeriodStart
())){
return
"派遣结束日期需大于等于派遣开始日期"
;
}
}
//更新岗位名称
return
null
;
}
/**
/**
* @Author fxj
* @Author fxj
* @Description 合同续签待签订信息单个/批量发起签署任务
* @Description 合同续签待签订信息单个/批量发起签署任务
...
...
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