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
6ce81ef2
Commit
6ce81ef2
authored
Sep 03, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.9' into MVP1.6.9
parents
bb4a3750
373f5ac5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+2
-2
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+10
-3
No files found.
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
6ce81ef2
...
...
@@ -238,9 +238,9 @@ emp.work.record.end.date.not.empty=\u5DE5\u4F5C\u7ECF\u5386\u7ED3\u675F\u65E5\u6
emp.work.job.not.empty
=
\u
5DE5
\u
4F5C
\u
5C97
\u
4F4D
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
dispatch.emp.education.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u
5B66
\u5386\u
4E3A
\u
7A7A
\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u
5B66
\u5386\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u
5B66
\u5386
dispatch.emp.education.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u
5B66
\u5386\u
4E3A
\u
7A7A
\u
6216\u
65E0
\u6863\u6848\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u
5B66
\u5386\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u
5B66
\u5386
dispatch.emp.registype.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u6237\u
53E3
\u6027\u
8D28
\u
4E3A
\u
7A7A
\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u6237\u
53E3
\u6027\u
8D28
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u6237\u
53E3
\u6027\u
8D28
dispatch.emp.registype.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u6237\u
53E3
\u6027\u
8D28
\u
4E3A
\u
7A7A
\u
6216\u
65E0
\u6863\u6848\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u6237\u
53E3
\u6027\u
8D28
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u6237\u
53E3
\u6027\u
8D28
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
6ce81ef2
...
...
@@ -817,7 +817,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
empVoMap
))
{
emp
=
empVoMap
.
get
(
excel
.
getEmpIdcard
());
}
if
(
Common
.
isEmpty
(
emp
.
getEmpRegisType
())
&&
Common
.
isNotNull
(
excel
.
getEmpRegisType
())){
if
(
Common
.
is
NotNull
(
emp
)
&&
Common
.
is
Empty
(
emp
.
getEmpRegisType
())
&&
Common
.
isNotNull
(
excel
.
getEmpRegisType
())){
vo
.
setEmpRegisType
(
excel
.
getEmpRegisType
());
}
if
(
Common
.
isNotNull
(
excel
.
getEducationName
()))
{
...
...
@@ -2318,12 +2318,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
||
Common
.
isEmpty
(
excel
.
getEmpMobile
())
||
Common
.
isEmpty
(
excel
.
getEmpType
())
||
Common
.
isEmpty
(
excel
.
getPost
())
||
Common
.
isEmpty
(
excel
.
getEmpRegisType
())
//无档案必填2024-08-21 fxj
||
Common
.
isEmpty
(
excel
.
getEducationName
())
//无档案必填2024-08-21 fxj
||
Common
.
isEmpty
(
excel
.
getContractName
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_NOT_EMPTY
)));
return
true
;
}
//无档案必填2024-08-21 fxj
if
(
Common
.
isEmpty
(
excel
.
getEmpRegisType
())
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_REGISTYPE_NOT_EMPTY
)));
return
true
;
}
if
(
Common
.
isEmpty
(
excel
.
getEducationName
())
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
)));
return
true
;
}
if
(
Common
.
isNotNull
(
excel
.
getContractName
())
&&
validContractInfo
(
errorMessageList
,
excel
)){
return
true
;
}
...
...
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