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
44203f59
Commit
44203f59
authored
Jul 11, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化人员档案
parent
4fd48bde
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
EmployeeVO.java
...a/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeVO.java
+2
-2
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeVO.java
View file @
44203f59
...
@@ -194,14 +194,14 @@ public class EmployeeVO extends RowIndex implements Serializable {
...
@@ -194,14 +194,14 @@ public class EmployeeVO extends RowIndex implements Serializable {
/**
/**
* 入学时间
* 入学时间
*/
*/
@DateTimeFormat
(
"yyyy-MM-dd
HH:mm:ss
"
)
@DateTimeFormat
(
"yyyy-MM-dd"
)
@ExcelProperty
(
value
=
"入学时间"
)
@ExcelProperty
(
value
=
"入学时间"
)
private
Date
admissionDate
;
private
Date
admissionDate
;
/**
/**
* 毕业时间
* 毕业时间
*/
*/
@DateTimeFormat
(
"yyyy-MM-dd
HH:mm:ss
"
)
@DateTimeFormat
(
"yyyy-MM-dd"
)
@ExcelProperty
(
value
=
"毕业时间"
)
@ExcelProperty
(
value
=
"毕业时间"
)
private
Date
gradutionDate
;
private
Date
gradutionDate
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
44203f59
...
@@ -851,7 +851,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -851,7 +851,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
deptList
==
null
||
deptList
.
isEmpty
())
{
if
(
deptList
==
null
||
deptList
.
isEmpty
())
{
errorMsg
=
new
HashSet
<>();
errorMsg
=
new
HashSet
<>();
errorMsg
.
add
(
EmployeeConstants
.
DEPT_NO_EXIST
);
errorMsg
.
add
(
EmployeeConstants
.
DEPT_NO_EXIST
);
errorMessageList
.
add
(
new
ErrorMessage
(
2
L
,
errorMsg
));
errorMessageList
.
add
(
new
ErrorMessage
(
-
1
L
,
errorMsg
));
return
R
.
failed
(
errorMessageList
);
return
R
.
failed
(
errorMessageList
);
}
else
{
}
else
{
for
(
TSettleDomain
dept
:
deptList
)
{
for
(
TSettleDomain
dept
:
deptList
)
{
...
...
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