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
76335095
Commit
76335095
authored
Jul 01, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reason
parent
b2640bd0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+3
-1
ErrorCodes.java
....cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java
+3
-1
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+1
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
76335095
...
...
@@ -759,9 +759,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
existEmp
.
getFileStatus
()
==
CommonConstants
.
ZERO_INT
)
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_IDCARD_EXISTING
,
excel
.
getEmpIdcard
()));
}
else
if
(
isCanAdd
==
0
)
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_
NOT
_EXISTS
,
excel
.
getEmpIdcard
()));
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_IMPORT_EMP_
ERROR_STATUS
_EXISTS
,
excel
.
getEmpIdcard
()));
}
else
{
saveEmp
=
existEmpMap
.
get
(
excel
.
getEmpIdcard
());
saveEmp
.
setProjectNum
(
CommonConstants
.
ONE_INT
);
saveList
.
add
(
saveEmp
);
}
}
else
{
// 档案不存在
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java
View file @
76335095
...
...
@@ -248,8 +248,10 @@ public interface ErrorCodes {
String
ARCHIVES_IMPORT_EMP_FILE_AREA_ERROR
=
"archives.import.emp.file.area.error"
;
// 大专及以上,最高学历必填
String
ARCHIVES_IMPORT_EMP_HIGH_EDUCATION_ERROR
=
"archives.import.emp.high.education.error"
;
//
根据身份证未找到人员档案信息
//
该人员未在档,请核实
String
ARCHIVES_IMPORT_EMP_NOT_EXISTS
=
"archives.import.emp.not.exists"
;
// 存在已减档的档案,禁止导入
String
ARCHIVES_IMPORT_EMP_ERROR_STATUS_EXISTS
=
"archives.import.emp.error.status..exists"
;
// 身份证必填
String
ARCHIVES_IMPORT_EMP_IDCARD_MUST
=
"archives.import.emp.idCard.must"
;
String
ARCHIVES_IMPORT_EMP_EMPNAME_MUST
=
"archives.import.emp.empName.must"
;
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
76335095
...
...
@@ -79,6 +79,7 @@ archives.import.emp.area.error=\u6237\u7C4D\u6240\u5728\u5730\u672A\u627E\u5230\
archives.import.emp.file.area.error
=
\u6863\u6848\u6240\u5728\u5730\u
672A
\u
627E
\u5230\u
533A
\u
57DF
archives.import.emp.high.education.error
=
\u5927\u
4E13
\u
53CA
\u
4EE5
\u
4E0A
\u
FF0C
\u6700\u
9AD8
\u
5B66
\u5386\u
5FC5
\u
586B
archives.import.emp.not.exists
=
\u
8BE5
\u
4EBA
\u5458\u
672A
\u5728\u6863\u
FF0C
\u
8BF7
\u6838\u
5B9E
archives.import.emp.error.status.exists
=
\u
5B58
\u5728\u
5DF2
\u
51CF
\u6863\u7684\u6863\u6848\u
FF0C
\u7981\u
6B62
\u
5BFC
\u5165
archives.import.emp.idCard.must
=
\u
8EAB
\u
4EFD
\u
8BC1
\u
5FC5
\u
586B
archives.import.emp.empName.must
=
\u5458\u
5DE5
\u
59D3
\u
540D
\u
5FC5
\u
586B
archives.import.emp.leaveReason.must
=
\u
51CF
\u6863\u
539F
\u
56E0
\u
5FC5
\u
586B
...
...
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