Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
00015512
Commit
00015512
authored
Jun 02, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
电子签发起校验-fxj
parent
e9f1951e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
7 deletions
+20
-7
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+20
-7
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
00015512
...
...
@@ -1428,19 +1428,32 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
// 规则1:标准合同(1)或劳务派遣合同(20),工资形式为计时/计件时,对应字段必填
// 兼容中文和数字两种格式
boolean
isStandard
OrDispatch
=
(
"1"
.
equals
(
contractType
)
||
"20"
.
equals
(
contractType
)
||
"标准合同
"
.
equals
(
contractType
)
||
"劳务派遣合同"
.
equals
(
contractType
));
boolean
isStandard
=
(
"1"
.
equals
(
contractType
)
||
"标准合同"
.
equals
(
contractType
));
boolean
isDispatch
=
(
"20
"
.
equals
(
contractType
)
||
"劳务派遣合同"
.
equals
(
contractType
));
if
(
isStandard
OrDispatch
)
{
if
(
isStandard
)
{
if
(
"1"
.
equals
(
salaryType
))
{
// 计时工资:计时工资标准必填
if
(
Common
.
isEmpty
(
contractPre
.
getSalaryStandardPerHour
()))
{
return
"标准合同
/劳务派遣合同的计时工资形式,计时工资标准
不能为空,请至“入职确认信息”点击修改补充完整"
;
return
"标准合同
合同为计时工资形式,“计时工资标准(元/月)”
不能为空,请至“入职确认信息”点击修改补充完整"
;
}
}
else
if
(
"2"
.
equals
(
salaryType
))
{
// 计件工资:计件工资单价必填
if
(
Common
.
isEmpty
(
contractPre
.
getSalaryStandardPerPiece
()))
{
return
"标准合同/劳务派遣合同的计件工资形式,计件工资单价不能为空,请至“入职确认信息”点击修改补充完整"
;
return
"标准合同合同为计件工资形式,“计件工资单价(元)”不能为空,请至“入职确认信息”点击修改补充完整"
;
}
}
}
if
(
isDispatch
)
{
if
(
"1"
.
equals
(
salaryType
))
{
// 计时工资:计时工资标准必填
if
(
Common
.
isEmpty
(
contractPre
.
getSalaryStandardPerHour
()))
{
return
"劳务派遣合同为计时工资形式,“计时工资标准(元/月)”不能为空,请至“入职确认信息”点击修改补充完整"
;
}
}
else
if
(
"2"
.
equals
(
salaryType
))
{
// 计件工资:计件工资单价必填
if
(
Common
.
isEmpty
(
contractPre
.
getSalaryStandardPerPiece
()))
{
return
"劳务派遣合同为计件工资形式,“计件工资单价(元)”不能为空,请至“入职确认信息”点击修改补充完整"
;
}
}
}
...
...
@@ -1448,7 +1461,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
// 规则2:劳务协议(3),劳务费必填
if
(
"3"
.
equals
(
contractType
)
||
"劳务协议"
.
equals
(
contractType
))
{
if
(
Common
.
isEmpty
(
contractPre
.
getLaborCost
()))
{
return
"劳务协议的
劳务费
不能为空,请至“入职确认信息”点击修改补充完整"
;
return
"劳务协议的
“劳务费(元/月)”
不能为空,请至“入职确认信息”点击修改补充完整"
;
}
}
...
...
@@ -1458,7 +1471,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
return
"非全日制合同的工资形式必须为计时工资,请至“入职确认信息”点击修改补充完整"
;
}
if
(
Common
.
isEmpty
(
contractPre
.
getSalaryStandardPerHour
()))
{
return
"非全日制合同的
计时工资标准
不能为空,请至“入职确认信息”点击修改补充完整"
;
return
"非全日制合同的
“计时工资标准(元/月)”
不能为空,请至“入职确认信息”点击修改补充完整"
;
}
}
...
...
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