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
fc0bbe3e
Commit
fc0bbe3e
authored
Mar 07, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
084fbb7c
0c7ac05f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
EmployeeRegistrationVo.java
...com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationVo.java
+6
-3
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+1
-0
No files found.
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationVo.java
View file @
fc0bbe3e
...
...
@@ -54,7 +54,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
* 岗位
*/
@Length
(
max
=
50
,
message
=
"岗位不能超过50个字符"
)
@ExcelAttribute
(
name
=
"岗位"
,
maxLength
=
50
)
@NotBlank
(
message
=
"岗位不能为空"
)
@ExcelAttribute
(
name
=
"岗位"
,
maxLength
=
50
,
isNotEmpty
=
true
,
errorInfo
=
"岗位不能为空"
)
@Schema
(
description
=
"岗位"
)
@ExcelProperty
(
"岗位"
)
private
String
position
;
...
...
@@ -62,7 +63,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
/**
* 反馈类型 1入职 2离职
*/
@ExcelAttribute
(
name
=
"登记类型"
,
readConverterExp
=
"1=入职,2=离职"
)
@NotBlank
(
message
=
"登记类型不能为空"
)
@ExcelAttribute
(
name
=
"登记类型"
,
readConverterExp
=
"1=入职,2=离职"
,
isNotEmpty
=
true
,
errorInfo
=
"登记类型不能为空"
)
@Schema
(
description
=
"登记类型"
)
@ExcelProperty
(
"登记类型"
)
private
String
feedbackType
;
...
...
@@ -70,7 +72,8 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
/**
* 入/离职日期
*/
@ExcelAttribute
(
name
=
"入/离职日期"
,
isDate
=
true
)
@NotBlank
(
message
=
"入/离职日期不能为空"
)
@ExcelAttribute
(
name
=
"入/离职日期"
,
isNotEmpty
=
true
,
errorInfo
=
"入/离职日期不能为空"
,
isDate
=
true
)
@Schema
(
description
=
"入/离职日期"
)
@ExcelProperty
(
"入/离职日期"
)
private
Date
joinLeaveDate
;
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
fc0bbe3e
...
...
@@ -236,6 +236,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
data
.
setRowIndex
(
rowIndex
+
1
);
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
if
(
Common
.
isNotNull
(
errorMessage
))
{
errorMessage
.
setData
(
data
);
errorMessageList
.
add
(
errorMessage
);
}
else
{
cachedDataList
.
add
(
data
);
...
...
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