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
f3e2b21e
Commit
f3e2b21e
authored
Apr 10, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21
parents
247b997f
cffcef32
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
10 deletions
+19
-10
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+9
-8
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+10
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
f3e2b21e
...
@@ -639,8 +639,8 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -639,8 +639,8 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
}
}
}
}
if
(
CommonConstants
.
TWENTY_STRING
.
equals
(
preVo
.
getContractType
())){
if
(
CommonConstants
.
TWENTY_STRING
.
equals
(
preVo
.
getContractType
())){
//处理务派遣合同: 先看上一份合同是否为劳务协议,如果是取值上一份合同的劳务协议结束日期
//处理务派遣合同: 先看上一份合同是否为劳务协议,如果是取值上一份合同的劳务协议结束日期
Date
initDate
=
contract
.
getContractEnd
();
Date
initDate
=
contract
.
getContractEnd
();
if
(
Common
.
isNotNull
(
contract
.
getPreNewId
())){
if
(
Common
.
isNotNull
(
contract
.
getPreNewId
())){
...
@@ -659,6 +659,13 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -659,6 +659,13 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
}
}
preVo
.
setDispatchPeriodStart
(
DateUtil
.
addDayByDate
(
initDate
,
1
));
preVo
.
setDispatchPeriodStart
(
DateUtil
.
addDayByDate
(
initDate
,
1
));
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodMonth
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodYear
()))
{
vo
=
new
TEmployeeContractDateVo
();
vo
.
setMonthAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodMonth
())
?
"0"
:
preVo
.
getDispatchPeriodMonth
()));
vo
.
setYearAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodYear
())
?
"0"
:
preVo
.
getDispatchPeriodYear
()));
vo
.
setRegistDate
(
preVo
.
getDispatchPeriodStart
());
preVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
}
List
<
String
>
errorMessages
=
new
ArrayList
<>();
List
<
String
>
errorMessages
=
new
ArrayList
<>();
if
(
Common
.
isNotNull
(
preVo
.
getContractDurationYear
())
if
(
Common
.
isNotNull
(
preVo
.
getContractDurationYear
())
...
@@ -707,13 +714,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -707,13 +714,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
}
}
}
}
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodMonth
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodYear
()))
{
vo
=
new
TEmployeeContractDateVo
();
vo
.
setMonthAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodMonth
())
?
"0"
:
preVo
.
getDispatchPeriodMonth
()));
vo
.
setYearAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
preVo
.
getDispatchPeriodYear
())
?
"0"
:
preVo
.
getDispatchPeriodYear
()));
vo
.
setRegistDate
(
preVo
.
getDispatchPeriodStart
());
preVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
}
// 如果有错误信息,根据具体错误项动态生成提示
// 如果有错误信息,根据具体错误项动态生成提示
if
(!
errorMessages
.
isEmpty
())
{
if
(!
errorMessages
.
isEmpty
())
{
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
f3e2b21e
...
@@ -1230,9 +1230,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1230,9 +1230,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
||
"标准合同"
.
equals
(
employeeContractPreVo
.
getContractType
()))
{
||
"标准合同"
.
equals
(
employeeContractPreVo
.
getContractType
()))
{
// 检查必要字段是否为空 关键字段不为空才校验
// 检查必要字段是否为空 关键字段不为空才校验
if
(!
Common
.
isEmpty
(
employeeContractPreVo
.
getContractTerm
())
boolean
flag
=
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractTerm
())
&&
!
Common
.
isEmpty
(
employeeContractPreVo
.
getTryPeriodNum
())
&&
!
Common
.
isEmpty
(
employeeContractPreVo
.
getTryPeriodNum
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
employeeContractPreVo
.
getTryPeriodType
()))
{
&&
CommonConstants
.
ZERO_STRING
.
equals
(
employeeContractPreVo
.
getTryPeriodType
());
if
(!
flag
){
flag
=
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractTerm
())
&&
!
Common
.
isEmpty
(
employeeContractPreVo
.
getTryPeriodNum
())
&&
!
"0"
.
equals
(
employeeContractPreVo
.
getTryPeriodNum
())
&&
(
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractEndType
())
||
CommonConstants
.
THREE_STRING
.
equals
(
employeeContractPreVo
.
getContractEndType
()));
}
if
(
flag
)
{
// 安全解析试用期月数
// 安全解析试用期月数
int
tryPeriodMonths
=
0
;
int
tryPeriodMonths
=
0
;
try
{
try
{
...
...
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