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
cffcef32
Commit
cffcef32
authored
Apr 10, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
试用期相关优化-fxj
parent
7cc60149
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+10
-2
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
cffcef32
...
@@ -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