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
c6bcb2d5
Commit
c6bcb2d5
authored
Apr 03, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.9-大专及以上,学校必填
parent
f774e833
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
0 deletions
+37
-0
ErrorCodes.java
.../cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
+2
-0
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+2
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+33
-0
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
View file @
c6bcb2d5
...
@@ -622,6 +622,8 @@ public interface ErrorCodes {
...
@@ -622,6 +622,8 @@ public interface ErrorCodes {
* 学历不可为空
* 学历不可为空
*/
*/
String
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
=
"dispatch.emp.education.not.empty"
;
String
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
=
"dispatch.emp.education.not.empty"
;
// 学历为大专及以上,学校必填
String
EMP_DISPATCH_EMP_SCHOOL_NOT_EMPTY
=
"dispatch.emp.school.not.empty"
;
/**
/**
* 户口性质不可为空
* 户口性质不可为空
*/
*/
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
c6bcb2d5
...
@@ -240,6 +240,8 @@ emp.work.job.not.empty=\u5DE5\u4F5C\u5C97\u4F4D\u4E0D\u53EF\u4E3A\u7A7A
...
@@ -240,6 +240,8 @@ emp.work.job.not.empty=\u5DE5\u4F5C\u5C97\u4F4D\u4E0D\u53EF\u4E3A\u7A7A
dispatch.emp.education.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u
5B66
\u5386\u
4E3A
\u
7A7A
\u6216\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.education.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u
5B66
\u5386\u
4E3A
\u
7A7A
\u6216\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.school.not.empty
=
\u
5B66
\u5386\u
4E3A
\u5927\u
4E13
\u
53CA
\u
4EE5
\u
4E0A
\u
FF0C
\u
5B66
\u6821\u
5FC5
\u
586B
dispatch.emp.registype.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u6237\u
53E3
\u6027\u
8D28
\u
4E3A
\u
7A7A
\u6216\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
dispatch.emp.registype.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u6237\u
53E3
\u6027\u
8D28
\u
4E3A
\u
7A7A
\u6216\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
dispatch.emp.tryperiod.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u
8BD5
\u7528\u
671F
\u
4E3A
\u
7A7A
\u6216\u
65E0
\u6863\u6848\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u
8BD5
\u7528\u
671F
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u
8BD5
\u7528\u
671F
dispatch.emp.tryperiod.not.empty
=
\u
5DF2
\u6709\u6863\u6848\u
8BD5
\u7528\u
671F
\u
4E3A
\u
7A7A
\u6216\u
65E0
\u6863\u6848\u
FF0C
\u
6D3E
\u5355\u
6A21
\u
677F
\u
8BD5
\u7528\u
671F
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
\u
FF0C
\u
8BF7
\u8865\u5145\u
8BD5
\u7528\u
671F
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
c6bcb2d5
...
@@ -81,6 +81,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -81,6 +81,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.cache.Cache
;
import
org.springframework.cache.Cache
;
import
org.springframework.cache.CacheManager
;
import
org.springframework.cache.CacheManager
;
import
org.springframework.cache.support.SimpleValueWrapper
;
import
org.springframework.cache.support.SimpleValueWrapper
;
import
org.springframework.security.core.parameters.P
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
@@ -2341,6 +2342,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2341,6 +2342,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SETTLEDOMAIN_STOP
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SETTLEDOMAIN_STOP
)));
return
true
;
return
true
;
}
}
String
educationName
;
if
(
Common
.
isEmpty
(
empVo
)){
if
(
Common
.
isEmpty
(
empVo
)){
if
(
Common
.
isEmpty
(
excel
.
getFileProvince
())
if
(
Common
.
isEmpty
(
excel
.
getFileProvince
())
||
Common
.
isEmpty
(
excel
.
getFileCity
())
||
Common
.
isEmpty
(
excel
.
getFileCity
())
...
@@ -2363,7 +2365,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2363,7 +2365,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isEmpty
(
excel
.
getEducationName
())
){
if
(
Common
.
isEmpty
(
excel
.
getEducationName
())
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
)));
return
true
;
return
true
;
}
else
if
(
Common
.
isEmpty
(
excel
.
getSchoolName
()))
{
educationName
=
excel
.
getEducationName
();
if
((
educationName
.
contains
(
"大专"
)
||
educationName
.
contains
(
"本科"
)
||
educationName
.
contains
(
"硕士"
)
||
educationName
.
contains
(
"博士"
)))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_SCHOOL_NOT_EMPTY
)));
return
true
;
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getContractName
())
&&
validContractInfo
(
errorMessageList
,
excel
)){
if
(
Common
.
isNotNull
(
excel
.
getContractName
())
&&
validContractInfo
(
errorMessageList
,
excel
)){
return
true
;
return
true
;
}
}
...
@@ -2406,6 +2418,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2406,6 +2418,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isEmpty
(
empVo
.
getHignEducation
())
&&
Common
.
isEmpty
(
excel
.
getEducationName
())){
if
(
Common
.
isEmpty
(
empVo
.
getHignEducation
())
&&
Common
.
isEmpty
(
excel
.
getEducationName
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY
)));
return
true
;
return
true
;
}
else
if
(
Common
.
isEmpty
(
excel
.
getSchoolName
())
&&
Common
.
isEmpty
(
empVo
.
getSchool
()))
{
educationName
=
excel
.
getEducationName
();
if
(
Common
.
isEmpty
(
educationName
))
{
educationName
=
empVo
.
getHignEducation
();
// 这里不判断null,因为上面判断过了empVo与excel的学历不都为空
if
((
educationName
.
equals
(
"5"
)
||
educationName
.
equals
(
"6"
)
||
educationName
.
equals
(
"7"
)
||
educationName
.
equals
(
"8"
)))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_SCHOOL_NOT_EMPTY
)));
return
true
;
}
}
else
{
if
((
educationName
.
contains
(
"大专"
)
||
educationName
.
contains
(
"本科"
)
||
educationName
.
contains
(
"硕士"
)
||
educationName
.
contains
(
"博士"
)))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_SCHOOL_NOT_EMPTY
)));
return
true
;
}
}
}
}
if
(
Common
.
isEmpty
(
empVo
.
getEmpRegisType
())
&&
Common
.
isEmpty
(
excel
.
getEmpRegisType
())){
if
(
Common
.
isEmpty
(
empVo
.
getEmpRegisType
())
&&
Common
.
isEmpty
(
excel
.
getEmpRegisType
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_REGISTYPE_NOT_EMPTY
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_REGISTYPE_NOT_EMPTY
)));
...
...
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