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
bc41a6b0
Commit
bc41a6b0
authored
Apr 09, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提示语优化-fxj
parent
b47e1ded
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
47 deletions
+51
-47
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+25
-24
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+26
-23
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
bc41a6b0
...
...
@@ -682,6 +682,30 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
//电子签 且 是劳务派遣合同 且 签订期限为固定期限的 合同年前置的合同不能小于 2 年,请检查";
return
"劳务派遣合同的合同年限不能小于 2 年,请检查"
;
}
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodStart
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodEnd
())){
if
(!
preVo
.
getDispatchPeriodEnd
().
after
(
preVo
.
getDispatchPeriodStart
())){
return
"派遣结束日期需大于派遣开始日期"
;
}
}
//合同开始时间、合同截止时间 与派遣的合同开始时间、合同截止时间一致
if
(
Common
.
isNotNull
(
preVo
.
getContractStart
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodStart
())
&&
!
preVo
.
getContractStart
().
equals
(
preVo
.
getDispatchPeriodStart
())){
errorMessages
.
add
(
"合同开始日期与派遣开始日期不一致"
);
}
if
(
Common
.
isNotNull
(
preVo
.
getContractEnd
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodEnd
())
&&
!
preVo
.
getContractEnd
().
equals
(
preVo
.
getDispatchPeriodEnd
())){
errorMessages
.
add
(
"合同截止日期与派遣截止日期不一致"
);
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if
(
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getContractTerm
())){
if
(!
preVo
.
getContractDurationYear
().
equals
(
preVo
.
getDispatchPeriodYear
())
||
!
preVo
.
getContractDurationMonth
().
equals
(
preVo
.
getDispatchPeriodMonth
())){
errorMessages
.
add
(
"合同的年限同派遣的期限不一致"
);
}
}
}
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodMonth
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodYear
()))
{
vo
=
new
TEmployeeContractDateVo
();
...
...
@@ -690,30 +714,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
vo
.
setRegistDate
(
preVo
.
getDispatchPeriodStart
());
preVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
}
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodStart
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodEnd
())){
if
(!
preVo
.
getDispatchPeriodEnd
().
after
(
preVo
.
getDispatchPeriodStart
())){
return
"派遣结束日期需大于派遣开始日期"
;
}
}
//合同开始时间、合同截止时间 与派遣的合同开始时间、合同截止时间一致
if
(
Common
.
isNotNull
(
preVo
.
getContractStart
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodStart
())
&&
!
preVo
.
getContractStart
().
equals
(
preVo
.
getDispatchPeriodStart
())){
errorMessages
.
add
(
"合同开始日期与派遣开始日期不一致"
);
}
if
(
Common
.
isNotNull
(
preVo
.
getContractEnd
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodEnd
())
&&
!
preVo
.
getContractEnd
().
equals
(
preVo
.
getDispatchPeriodEnd
())){
errorMessages
.
add
(
"合同截止日期与派遣截止日期不一致"
);
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if
(
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getContractTerm
())){
if
(!
preVo
.
getContractDurationYear
().
equals
(
preVo
.
getDispatchPeriodYear
())
||
!
preVo
.
getContractDurationMonth
().
equals
(
preVo
.
getDispatchPeriodMonth
())){
errorMessages
.
add
(
"合同的年限同派遣的期限不一致"
);
}
}
// 如果有错误信息,根据具体错误项动态生成提示
if
(!
errorMessages
.
isEmpty
())
{
// 筛选出需要组合提示的错误项
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
bc41a6b0
...
...
@@ -1192,23 +1192,33 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
////电子签 且 是劳务派遣合同 且 签订期限为固定期限的 合同年前置的合同不能小于 2 年,请检查";
return
"劳务派遣合同的合同年限不能小于 2 年,请检查"
;
}
}
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodEnd
()))
{
if
(
employeeContractPreVo
.
getDispatchPeriodEnd
().
before
(
employeeContractPreVo
.
getDispatchPeriodStart
()))
{
return
"派遣结束日期需大于等于派遣开始日期"
;
// 合同开始时间、合同截止时间应与派遣的合同开始时间、合同截止时间一致
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodStart
())
&&
!
employeeContractPreVo
.
getContractStart
().
equals
(
employeeContractPreVo
.
getDispatchPeriodStart
()))
{
allErrorMessages
.
add
(
"合同开始日期与派遣开始日期不一致"
);
}
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractEnd
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodEnd
())
&&
!
employeeContractPreVo
.
getContractEnd
().
equals
(
employeeContractPreVo
.
getDispatchPeriodEnd
()))
{
allErrorMessages
.
add
(
"合同截止日期与派遣截止日期不一致"
);
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if
(
"劳务派遣合同"
.
equals
(
employeeContractPreVo
.
getContractType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractTerm
())){
if
(!
employeeContractPreVo
.
getContractDurationYear
().
equals
(
employeeContractPreVo
.
getDispatchPeriodYear
())
||
!
employeeContractPreVo
.
getContractDurationMonth
().
equals
(
employeeContractPreVo
.
getDispatchPeriodMonth
())){
allErrorMessages
.
add
(
"合同的年限同派遣的期限不一致"
);
}
}
}
// 合同开始时间、合同截止时间应与派遣的合同开始时间、合同截止时间一致
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodStart
())
&&
!
employeeContractPreVo
.
getContractStart
().
equals
(
employeeContractPreVo
.
getDispatchPeriodStart
()))
{
allErrorMessages
.
add
(
"合同开始日期与派遣开始日期不一致"
);
}
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractEnd
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodEnd
())
&&
!
employeeContractPreVo
.
getContractEnd
().
equals
(
employeeContractPreVo
.
getDispatchPeriodEnd
()))
{
allErrorMessages
.
add
(
"合同截止日期与派遣截止日期不一致"
);
}
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodEnd
()))
{
if
(
employeeContractPreVo
.
getDispatchPeriodEnd
().
before
(
employeeContractPreVo
.
getDispatchPeriodStart
()))
{
return
"派遣结束日期需大于等于派遣开始日期"
;
}
}
...
...
@@ -1289,14 +1299,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if
(
"劳务派遣合同"
.
equals
(
employeeContractPreVo
.
getContractType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractTerm
())){
if
(!
employeeContractPreVo
.
getContractDurationYear
().
equals
(
employeeContractPreVo
.
getDispatchPeriodYear
())
||
!
employeeContractPreVo
.
getContractDurationMonth
().
equals
(
employeeContractPreVo
.
getDispatchPeriodMonth
())){
allErrorMessages
.
add
(
"合同的年限同派遣的期限不一致"
);
}
}
// 如果有错误信息,根据具体错误项动态生成提示
if
(!
allErrorMessages
.
isEmpty
())
{
...
...
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