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
c7c85b8e
Commit
c7c85b8e
authored
Apr 09, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化-fxj
parent
30b6f422
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+7
-6
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+8
-7
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
c7c85b8e
...
@@ -633,6 +633,12 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -633,6 +633,12 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
}
}
}
}
//同商务合同一直 要 验证时间 截止时间大于等于开始时间、时间交叉
if
(
Common
.
isNotNull
(
preVo
.
getContractStart
())
&&
Common
.
isNotNull
(
preVo
.
getContractEnd
())){
if
(!
preVo
.
getContractEnd
().
after
(
preVo
.
getContractStart
())){
return
"合同截止日期需大于合同开始日期"
;
}
}
if
(
CommonConstants
.
TWENTY_STRING
.
equals
(
preVo
.
getContractType
())){
if
(
CommonConstants
.
TWENTY_STRING
.
equals
(
preVo
.
getContractType
())){
//处理务派遣合同: 先看上一份合同是否为劳务协议,如果是取值上一份合同的劳务协议结束日期
//处理务派遣合同: 先看上一份合同是否为劳务协议,如果是取值上一份合同的劳务协议结束日期
Date
initDate
=
contract
.
getContractEnd
();
Date
initDate
=
contract
.
getContractEnd
();
...
@@ -739,12 +745,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -739,12 +745,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
}
}
}
}
//同商务合同一直 要 验证时间 截止时间大于等于开始时间、时间交叉
if
(
Common
.
isNotNull
(
preVo
.
getContractStart
())
&&
Common
.
isNotNull
(
preVo
.
getContractEnd
())){
if
(!
preVo
.
getContractEnd
().
after
(
preVo
.
getContractStart
())){
return
"合同截止日期需大于合同开始日期"
;
}
}
//更新岗位名称
//更新岗位名称
return
null
;
return
null
;
}
}
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
c7c85b8e
...
@@ -1285,6 +1285,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1285,6 +1285,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
allErrorMessages
.
add
(
"合同的年限同派遣的期限不一致"
);
allErrorMessages
.
add
(
"合同的年限同派遣的期限不一致"
);
}
}
}
}
// 校验合同有效期:合同截止日期不得早于合同开始日期
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractEnd
()))
{
if
(!
employeeContractPreVo
.
getContractEnd
().
after
(
employeeContractPreVo
.
getContractStart
()))
{
return
"合同截止日期需大于合同开始日期"
;
}
}
// 如果有错误信息,根据具体错误项动态生成提示
// 如果有错误信息,根据具体错误项动态生成提示
if
(!
allErrorMessages
.
isEmpty
())
{
if
(!
allErrorMessages
.
isEmpty
())
{
// 筛选出需要组合提示的错误项
// 筛选出需要组合提示的错误项
...
@@ -1322,14 +1330,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1322,14 +1330,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return
"派遣的"
+
dispatchStr
+
"同合同的"
+
contractStr
+
"不一致,请调整!"
;
return
"派遣的"
+
dispatchStr
+
"同合同的"
+
contractStr
+
"不一致,请调整!"
;
}
}
}
}
// 校验合同有效期:合同截止日期不得早于合同开始日期
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractEnd
()))
{
if
(!
employeeContractPreVo
.
getContractEnd
().
after
(
employeeContractPreVo
.
getContractStart
()))
{
return
"合同截止日期需大于合同开始日期"
;
}
}
return
null
;
return
null
;
}
}
...
...
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