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
1fdba7e1
Commit
1fdba7e1
authored
Sep 28, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
32b081a9
6816825d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+1
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+2
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
1fdba7e1
...
...
@@ -38,7 +38,7 @@ public class EmployeeConstants {
public
static
final
String
OTHERS
=
"其他"
;
public
static
final
String
SUB_MUST
=
"业务细分必填"
;
public
static
final
String
CONTRACT_END_MUST
=
"合同到期时间必填"
;
public
static
final
String
CONTRACT_TYPE_
TWO
=
"2
"
;
public
static
final
String
CONTRACT_TYPE_
ONE
=
"1
"
;
public
static
final
String
CONTRACT_NO_IN_USE
=
"暂无可操作的合同"
;
public
static
final
String
CONTRACT_NAME_EMPTY
=
"合同类型不能为空"
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
1fdba7e1
...
...
@@ -843,7 +843,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
insert
.
setContractEnd
(
contractInfo
.
getContractEnd
());
}
}
else
{
if
(!
EmployeeConstants
.
CONTRACT_TYPE_TWO
.
equals
(
insert
.
getContractType
())
// 2022-9-28 16:59:57 徐梅说产品在验收时,业务说已完成一定任务的也不必填
if
(
EmployeeConstants
.
CONTRACT_TYPE_ONE
.
equals
(
insert
.
getContractType
())
&&
Common
.
isEmpty
(
insert
.
getContractEnd
()))
{
errorInfo
.
append
(
EmployeeConstants
.
CONTRACT_END_MUST
);
}
...
...
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