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
ea6e90b6
Commit
ea6e90b6
authored
Jun 19, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目档案无岗位更新岗位fxj 2024-04-17
parent
50e14c0a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
EmployeeVO.java
...a/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeVO.java
+0
-2
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+2
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+12
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeVO.java
View file @
ea6e90b6
...
@@ -104,7 +104,6 @@ public class EmployeeVO extends RowIndex implements Serializable {
...
@@ -104,7 +104,6 @@ public class EmployeeVO extends RowIndex implements Serializable {
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"婚姻状况"
)
@ExcelProperty
(
value
=
"婚姻状况"
)
@ExcelAttribute
(
name
=
"婚姻状况"
,
isNotEmpty
=
true
,
maxLength
=
20
,
errorInfo
=
"婚姻状况必填且不可超过20位"
)
@Size
(
max
=
32
,
message
=
"婚姻状况不可超过32位"
)
@Size
(
max
=
32
,
message
=
"婚姻状况不可超过32位"
)
private
String
empMarriStatus
;
private
String
empMarriStatus
;
...
@@ -119,7 +118,6 @@ public class EmployeeVO extends RowIndex implements Serializable {
...
@@ -119,7 +118,6 @@ public class EmployeeVO extends RowIndex implements Serializable {
/**
/**
* 政治面貌
* 政治面貌
*/
*/
@ExcelAttribute
(
name
=
"政治面貌"
,
isNotEmpty
=
true
,
maxLength
=
20
,
errorInfo
=
"政治面貌必填且不可超过20位"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"政治面貌"
)
@ExcelProperty
(
value
=
"政治面貌"
)
@Size
(
max
=
32
,
message
=
"政治面貌不可超过32位"
)
@Size
(
max
=
32
,
message
=
"政治面貌不可超过32位"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
ea6e90b6
...
@@ -33,6 +33,8 @@ public class EmployeeConstants {
...
@@ -33,6 +33,8 @@ public class EmployeeConstants {
public
static
final
String
DEPT_NO_EXIST
=
"未找到对应的项目,请核实"
;
public
static
final
String
DEPT_NO_EXIST
=
"未找到对应的项目,请核实"
;
public
static
final
String
CHECK_ERROR
=
"校验服务错误,请联系管理员!"
;
public
static
final
String
CHECK_ERROR
=
"校验服务错误,请联系管理员!"
;
public
static
final
String
CHECK_NO_RESPONSE
=
"校验服务器未返回,请联系管理员!"
;
public
static
final
String
CHECK_NO_RESPONSE
=
"校验服务器未返回,请联系管理员!"
;
public
static
final
String
MARRY_STATUS_NOT_NULL
=
"婚姻状况不可为空"
;
public
static
final
String
POLITICAL_STATUS_NOT_NULL
=
"婚姻状况不可为空"
;
// 拦截合同使用
// 拦截合同使用
public
static
final
String
SITUATION_ONE
=
"正常签订"
;
public
static
final
String
SITUATION_ONE
=
"正常签订"
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
ea6e90b6
...
@@ -1078,6 +1078,18 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -1078,6 +1078,18 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg
=
new
HashSet
<>();
errorMsg
=
new
HashSet
<>();
excel
=
excelVOList
.
get
(
i
);
excel
=
excelVOList
.
get
(
i
);
//政治面貌不可为空
if
(
Common
.
isEmpty
(
excel
.
getEmpMarriStatus
())){
errorMsg
.
add
(
EmployeeConstants
.
MARRY_STATUS_NOT_NULL
);
errorMessageList
.
add
(
new
ErrorMessage
((
i
+
2L
),
errorMsg
));
continue
;
}
//婚姻状态不可为空
if
(
Common
.
isEmpty
(
excel
.
getPoliticalStatus
())){
errorMsg
.
add
(
EmployeeConstants
.
POLITICAL_STATUS_NOT_NULL
);
errorMessageList
.
add
(
new
ErrorMessage
((
i
+
2L
),
errorMsg
));
continue
;
}
if
(
deptMap
.
get
(
excel
.
getDeptNo
())
==
null
)
{
if
(
deptMap
.
get
(
excel
.
getDeptNo
())
==
null
)
{
errorMsg
.
add
(
EmployeeConstants
.
DEPT_NO_ERROR
);
errorMsg
.
add
(
EmployeeConstants
.
DEPT_NO_ERROR
);
}
}
...
...
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