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
5bdb3f3c
Commit
5bdb3f3c
authored
Apr 27, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
学历及学校优化-fxj
parent
ba1e76dd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+3
-2
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
5bdb3f3c
...
@@ -2605,6 +2605,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2605,6 +2605,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
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
;
}
}
//派单学历无值时,如果档案有值直接取值档案 2024-08-21 fxj
initEducation
(
excel
,
null
,
empVo
);
// 根据社保户配置的collegeDegreeRequired字段判断是否必填学校
// 根据社保户配置的collegeDegreeRequired字段判断是否必填学校
if
(
Common
.
isNotNull
(
socialHouseHoldInfo
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
socialHouseHoldInfo
.
getCollegeDegreeRequired
()))
{
if
(
Common
.
isNotNull
(
socialHouseHoldInfo
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
socialHouseHoldInfo
.
getCollegeDegreeRequired
()))
{
if
(
Common
.
isEmpty
(
excel
.
getSchoolName
())
&&
Common
.
isEmpty
(
empVo
.
getSchool
()))
{
if
(
Common
.
isEmpty
(
excel
.
getSchoolName
())
&&
Common
.
isEmpty
(
empVo
.
getSchool
()))
{
...
@@ -2705,8 +2707,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2705,8 +2707,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//如果档案有值直接取值档案 2024-08-21 fxj
//如果档案有值直接取值档案 2024-08-21 fxj
excel
.
setEmpRegisType
(
empVo
.
getEmpRegisType
());
excel
.
setEmpRegisType
(
empVo
.
getEmpRegisType
());
}
}
//派单学历无值时,如果档案有值直接取值档案 2024-08-21 fxj
initEducation
(
excel
,
null
,
empVo
);
if
(
Common
.
isEmpty
(
excel
.
getPost
()))
{
if
(
Common
.
isEmpty
(
excel
.
getPost
()))
{
excel
.
setPost
(
empVo
.
getPost
());
excel
.
setPost
(
empVo
.
getPost
());
}
}
...
...
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