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
437b2824
Commit
437b2824
authored
Jul 14, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
空导出
parent
1ad2009a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+3
-3
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+2
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
437b2824
...
...
@@ -132,12 +132,12 @@ public class TEmployeeContractInfo extends BaseEntity {
@Schema
(
description
=
"客户名称"
,
name
=
"subjectUnit"
)
private
String
subjectUnit
;
/**
* 签订类型
* 签订类型
(字典也是汉字
*/
@NotBlank
(
message
=
"签订类型不能为空"
)
@Length
(
max
=
1
,
message
=
"签订类型不能超过1个字符"
)
@ExcelAttribute
(
name
=
"签订类型"
,
isNotEmpty
=
true
,
errorInfo
=
"签订类型不能为空"
,
maxLength
=
100
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMPLOYEE_SITUATION_TYPE
)
@Schema
(
description
=
"签订类型(字典)"
,
name
=
"situation"
)
@ExcelAttribute
(
name
=
"签订类型"
,
isNotEmpty
=
true
,
errorInfo
=
"签订类型不能为空"
,
maxLength
=
100
)
@Schema
(
description
=
"签订类型(字典
也是汉字
)"
,
name
=
"situation"
)
private
String
situation
;
/**
* 合同年限
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
437b2824
...
...
@@ -32,6 +32,8 @@ public class EmployeeConstants {
public
static
final
String
DEPT_NO_EXIST
=
"根据项目编码未找到项目"
;
public
static
final
String
CHECK_ERROR
=
"校验服务错误,请联系管理员!"
;
public
static
final
String
CHECK_NO_RESPONSE
=
"校验服务器未返回,请联系管理员!"
;
public
static
final
String
SITUATION_SIX
=
"作废"
;
public
static
final
String
SITUATION_SEVEN
=
"终止"
;
/**
* 无数据可更新
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
437b2824
...
...
@@ -407,8 +407,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
2
])
{
// 作废、终止,不变为在用
if
(
Common
.
isEmpty
(
contractInfo
.
getSituation
())
||
(!
CommonConstants
.
dingleDigitStrArray
[
6
]
.
equals
(
contractInfo
.
getSituation
())
&&
!
CommonConstants
.
dingleDigitStrArray
[
7
]
.
equals
(
contractInfo
.
getSituation
())))
{
||
(!
EmployeeConstants
.
SITUATION_SIX
.
equals
(
contractInfo
.
getSituation
())
&&
!
EmployeeConstants
.
SITUATION_SIX
.
equals
(
contractInfo
.
getSituation
())))
{
tEmployeeContractInfo
.
setInUse
(
CommonConstants
.
ZERO_STRING
);
}
tEmployeeContractInfo
.
setAuditTimeLast
(
LocalDateTime
.
now
());
...
...
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