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
578df4b1
Commit
578df4b1
authored
Sep 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.15-学历
parent
5530b3fd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
13 deletions
+32
-13
TDispatchReduceVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchReduceVo.java
+9
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+23
-13
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchReduceVo.java
View file @
578df4b1
...
@@ -136,4 +136,13 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
...
@@ -136,4 +136,13 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
@Schema
(
description
=
"是否同步终止合同、减项、减档"
,
name
=
"changeContractAndEmployee"
)
@Schema
(
description
=
"是否同步终止合同、减项、减档"
,
name
=
"changeContractAndEmployee"
)
@ExcelProperty
(
"是否同步终止合同、减项、减档"
)
@ExcelProperty
(
"是否同步终止合同、减项、减档"
)
private
String
changeContractAndEmployee
;
private
String
changeContractAndEmployee
;
/**
* 学历名称
*/
@ExcelAttribute
(
name
=
"学历"
,
isNotEmpty
=
false
)
@Schema
(
description
=
"学历:派减只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"学历"
)
private
String
educationName
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
578df4b1
...
@@ -2577,7 +2577,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2577,7 +2577,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
excel
.
setEmpRegisType
(
empVo
.
getEmpRegisType
());
excel
.
setEmpRegisType
(
empVo
.
getEmpRegisType
());
}
}
//派单学历无值时,如果档案有值直接取值档案 2024-08-21 fxj
//派单学历无值时,如果档案有值直接取值档案 2024-08-21 fxj
initEducation
(
excel
,
empVo
);
initEducation
(
excel
,
null
,
empVo
);
if
(
Common
.
isEmpty
(
excel
.
getPost
()))
{
if
(
Common
.
isEmpty
(
excel
.
getPost
()))
{
excel
.
setPost
(
empVo
.
getPost
());
excel
.
setPost
(
empVo
.
getPost
());
}
}
...
@@ -2729,40 +2729,46 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2729,40 +2729,46 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
false
;
return
false
;
}
}
private
void
initEducation
(
TDispatchImportVo
excel
,
DispatchEmpVo
empVo
)
{
private
void
initEducation
(
TDispatchImportVo
excel
,
TDispatchReduceVo
excelReduce
,
DispatchEmpVo
empVo
)
{
if
(
Common
.
isNotNull
(
empVo
.
getHignEducation
()))
{
if
(
Common
.
isNotNull
(
empVo
.
getHignEducation
()))
{
String
educationName
=
null
;
if
(
empVo
.
getHignEducation
().
equals
(
"1"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"1"
))
{
e
xcel
.
setEducationName
(
"文盲"
)
;
e
ducationName
=
"文盲"
;
}
}
if
(
empVo
.
getHignEducation
().
equals
(
"2"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"2"
))
{
e
xcel
.
setEducationName
(
"小学"
)
;
e
ducationName
=
"小学"
;
}
}
if
(
empVo
.
getHignEducation
().
equals
(
"3"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"3"
))
{
e
xcel
.
setEducationName
(
"初中"
)
;
e
ducationName
=
"初中"
;
}
}
if
(
empVo
.
getHignEducation
().
equals
(
"4"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"4"
))
{
e
xcel
.
setEducationName
(
"高中"
)
;
e
ducationName
=
"高中"
;
}
}
if
(
empVo
.
getHignEducation
().
equals
(
"5"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"5"
))
{
e
xcel
.
setEducationName
(
"大专"
)
;
e
ducationName
=
"大专"
;
}
}
if
(
empVo
.
getHignEducation
().
equals
(
"6"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"6"
))
{
e
xcel
.
setEducationName
(
"本科"
)
;
e
ducationName
=
"本科"
;
}
}
if
(
empVo
.
getHignEducation
().
equals
(
"7"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"7"
))
{
e
xcel
.
setEducationName
(
"硕士"
)
;
e
ducationName
=
"硕士"
;
}
}
if
(
empVo
.
getHignEducation
().
equals
(
"8"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"8"
))
{
e
xcel
.
setEducationName
(
"博士"
)
;
e
ducationName
=
"博士"
;
}
}
if
(
empVo
.
getHignEducation
().
equals
(
"9"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"9"
))
{
e
xcel
.
setEducationName
(
"技工"
)
;
e
ducationName
=
"技工"
;
}
}
if
(
empVo
.
getHignEducation
().
equals
(
"10"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"10"
))
{
e
xcel
.
setEducationName
(
"职高"
)
;
e
ducationName
=
"职高"
;
}
}
if
(
empVo
.
getHignEducation
().
equals
(
"11"
))
{
if
(
empVo
.
getHignEducation
().
equals
(
"11"
))
{
excel
.
setEducationName
(
"中专"
);
educationName
=
"中专"
;
}
if
(
excel
!=
null
)
{
excel
.
setEducationName
(
educationName
);
}
else
if
(
excelReduce
!=
null
)
{
excelReduce
.
setEducationName
(
educationName
);
}
}
}
}
}
}
...
@@ -3192,6 +3198,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3192,6 +3198,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
excelVOTemp
.
put
(
excel
.
getRowIndex
().
toString
(),
excel
.
getEmpIdcard
());
excelVOTemp
.
put
(
excel
.
getRowIndex
().
toString
(),
excel
.
getEmpIdcard
());
// 初始化派单 和 社保公积金查询信息
// 初始化派单 和 社保公积金查询信息
dispatch
=
getDispatchInfo
(
empVo
,
excel
,
socialFund
,
setInfoVo
,
user
);
dispatch
=
getDispatchInfo
(
empVo
,
excel
,
socialFund
,
setInfoVo
,
user
);
//派单学历无值时,如果档案有值直接取值档案 2024-08-21 fxj
initEducation
(
null
,
excel
,
empVo
);
if
(
Common
.
isEmpty
(
dispatch
.
getDispatchItem
()))
{
if
(
Common
.
isEmpty
(
dispatch
.
getDispatchItem
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_ITEM_EMPTY_EXISTS
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_ITEM_EMPTY_EXISTS
)));
continue
;
continue
;
...
@@ -3251,6 +3260,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3251,6 +3260,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch
.
setCreateName
(
user
.
getNickname
());
dispatch
.
setCreateName
(
user
.
getNickname
());
dispatch
.
setOrganName
(
user
.
getDeptName
());
dispatch
.
setOrganName
(
user
.
getDeptName
());
}
}
dispatch
.
setEducationName
(
excel
.
getEducationName
());
dispatch
.
setChangeContractAndEmployee
(
excel
.
getChangeContractAndEmployee
());
dispatch
.
setChangeContractAndEmployee
(
excel
.
getChangeContractAndEmployee
());
dispatch
.
setCreateTime
(
LocalDateTime
.
now
());
dispatch
.
setCreateTime
(
LocalDateTime
.
now
());
dispatch
.
setEmpId
(
socialFund
.
getEmpId
());
dispatch
.
setEmpId
(
socialFund
.
getEmpId
());
...
...
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