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
858061ab
Commit
858061ab
authored
Jun 20, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
基础档案新增字段及必填调整
parent
4c2585ce
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
0 deletions
+11
-0
TEmpWorkRecordingServiceImpl.java
...u/archives/service/impl/TEmpWorkRecordingServiceImpl.java
+4
-0
ErrorCodes.java
.../cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
+5
-0
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+2
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpWorkRecordingServiceImpl.java
View file @
858061ab
...
@@ -105,6 +105,10 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
...
@@ -105,6 +105,10 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_WORKING_RECODE_END_DATE_NOT_EMPTY
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_WORKING_RECODE_END_DATE_NOT_EMPTY
)));
continue
;
continue
;
}
}
if
(
Common
.
isEmpty
(
excel
.
getWorkJob
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_WORKING_JOB_NOT_EMPTY
)));
continue
;
}
// 数据合法情况
// 数据合法情况
insertExcel
(
excel
,
emp
);
insertExcel
(
excel
,
emp
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
));
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
View file @
858061ab
...
@@ -612,4 +612,9 @@ public interface ErrorCodes {
...
@@ -612,4 +612,9 @@ public interface ErrorCodes {
* 工作经历结束日期不可为空
* 工作经历结束日期不可为空
*/
*/
String
EMP_WORKING_RECODE_END_DATE_NOT_EMPTY
=
"emp.work.record.end.date.not.empty"
;
String
EMP_WORKING_RECODE_END_DATE_NOT_EMPTY
=
"emp.work.record.end.date.not.empty"
;
/**
* 工作岗位不可为空
*/
String
EMP_WORKING_JOB_NOT_EMPTY
=
"emp.work.job.not.empty"
;
}
}
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
858061ab
...
@@ -235,6 +235,8 @@ emp.dispatch.signle.reduce=\u516C\u79EF\u91D1\u672A\u6D3E\u51CF\uFF0C\u8BF7\u683
...
@@ -235,6 +235,8 @@ emp.dispatch.signle.reduce=\u516C\u79EF\u91D1\u672A\u6D3E\u51CF\uFF0C\u8BF7\u683
emp.work.record.end.date.not.empty
=
\u
5DE5
\u
4F5C
\u
7ECF
\u5386\u
7ED3
\u
675F
\u
65E5
\u
671F
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
emp.work.record.end.date.not.empty
=
\u
5DE5
\u
4F5C
\u
7ECF
\u5386\u
7ED3
\u
675F
\u
65E5
\u
671F
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
emp.work.job.not.empty
=
\u
5DE5
\u
4F5C
\u
5C97
\u
4F4D
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
...
...
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