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
1b6a1a82
Commit
1b6a1a82
authored
Jul 07, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
a47c9087
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
17 deletions
+18
-17
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+18
-17
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
1b6a1a82
...
...
@@ -592,7 +592,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
addVo
.
setProjectsMap
(
projectsMap
);
R
<
EmpDispatchAddVo
>
res
=
archivesDaprUtil
.
addDispatchInfo
(
addVo
);
// 开始插入各种数据了
insertAllInfo
(
excelVOList
,
errorMessageList
,
empVo
,
res
,
socialsMap
,
fundsMap
,
socialFundAddMap
,
dispatchMap
,
excelVOTemp
,
dispatchPart
,
injury
);
insertAllInfo
(
excelVOList
,
errorMessageList
,
empVo
Map
,
res
,
socialsMap
,
fundsMap
,
socialFundAddMap
,
dispatchMap
,
excelVOTemp
,
dispatchPart
,
injury
);
// 清理map list 等数据
Common
.
clear
(
excelVOList
);
Common
.
clear
(
empAddsMap
);
...
...
@@ -621,7 +621,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
void
insertAllInfo
(
List
<
TDispatchImportVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
DispatchEmpVo
empVo
,
Map
<
String
,
DispatchEmpVo
>
empVoMap
,
R
<
EmpDispatchAddVo
>
res
,
Map
<
String
,
TSocialInfo
>
socialsMap
,
Map
<
String
,
TProvidentFund
>
fundsMap
,
...
...
@@ -730,7 +730,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 同步更新人员档案和项目档案的社保公积金状态
updateDocSocialFund
(
social
,
fund
,
socialFund
,
empVo
,
excel
);
updateDocSocialFund
(
social
,
fund
,
socialFund
,
empVo
Map
,
excel
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
}
catch
(
Exception
e
){
log
.
error
(
"派单新增异常:"
,
e
);
...
...
@@ -758,7 +758,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfoMapper
.
insert
(
auditInfo
);
}
private
void
updateDocSocialFund
(
TSocialInfo
social
,
TProvidentFund
fund
,
TSocialFundInfo
socialFund
,
DispatchEmpVo
empVo
,
TDispatchImportVo
excel
)
{
private
void
updateDocSocialFund
(
TSocialInfo
social
,
TProvidentFund
fund
,
TSocialFundInfo
socialFund
,
Map
<
String
,
DispatchEmpVo
>
empVoMap
,
TDispatchImportVo
excel
)
{
UpProjectSocialFundVo
vo
=
new
UpProjectSocialFundVo
();
if
(
Common
.
isNotNull
(
social
))
{
vo
.
setSocialStatus
(
CommonConstants
.
ONE_STRING
);
...
...
@@ -796,8 +796,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
vo
.
setMobile
(
excel
.
getEmpMobile
());
vo
.
setEmpIdCard
(
socialFund
.
getEmpIdcard
());
if
(
Common
.
isNotNull
(
excel
.
getEducationName
()))
{
if
(
Common
.
isNotNull
(
empVo
))
{
if
(
Common
.
isEmpty
(
empVo
.
getHignEducation
()))
{
DispatchEmpVo
emp
=
empVoMap
.
get
(
excel
.
getEmpIdcard
());
if
(
Common
.
isNotNull
(
emp
))
{
if
(
Common
.
isEmpty
(
emp
.
getHignEducation
()))
{
if
(
excel
.
getEducationName
().
equals
(
"文盲"
))
{
vo
.
setHighEducation
(
"1"
);
}
...
...
@@ -830,54 +831,54 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
if
(
Common
.
isNotNull
(
emp
Vo
.
getHignEducation
()))
{
if
(
Common
.
isNotNull
(
emp
.
getHignEducation
()))
{
if
(
excel
.
getEducationName
().
equals
(
"文盲"
))
{
if
(
emp
Vo
.
getHignEducation
()
==
"1"
)
{
if
(
emp
.
getHignEducation
()
==
"1"
)
{
vo
.
setHighEducation
(
"1"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"小学"
))
{
if
(
emp
Vo
.
getHignEducation
()
==
"2"
)
{
if
(
emp
.
getHignEducation
()
==
"2"
)
{
vo
.
setHighEducation
(
"2"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"初中"
))
{
if
(
emp
Vo
.
getHignEducation
()
==
"3"
)
{
if
(
emp
.
getHignEducation
()
==
"3"
)
{
vo
.
setHighEducation
(
"3"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"高中"
))
{
if
(
emp
Vo
.
getHignEducation
()
==
"4"
)
{
if
(
emp
.
getHignEducation
()
==
"4"
)
{
vo
.
setHighEducation
(
"4"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"大专"
))
{
if
(
emp
Vo
.
getHignEducation
()
==
"5"
)
{
if
(
emp
.
getHignEducation
()
==
"5"
)
{
vo
.
setHighEducation
(
"5"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"本科"
))
{
if
(
emp
Vo
.
getHignEducation
()
==
"6"
)
{
if
(
emp
.
getHignEducation
()
==
"6"
)
{
vo
.
setHighEducation
(
"6"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"硕士"
))
{
if
(
emp
Vo
.
getHignEducation
()
==
"7"
)
{
if
(
emp
.
getHignEducation
()
==
"7"
)
{
vo
.
setHighEducation
(
"7"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"技工"
))
{
if
(
emp
Vo
.
getHignEducation
()
==
"9"
)
{
if
(
emp
.
getHignEducation
()
==
"9"
)
{
vo
.
setHighEducation
(
"9"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"职高"
))
{
if
(
emp
Vo
.
getHignEducation
()
==
"10"
)
{
if
(
emp
.
getHignEducation
()
==
"10"
)
{
vo
.
setHighEducation
(
"10"
);
}
}
if
(
excel
.
getEducationName
().
equals
(
"中专"
))
{
if
(
emp
Vo
.
getHignEducation
()
==
"11"
)
{
if
(
emp
.
getHignEducation
()
==
"11"
)
{
vo
.
setHighEducation
(
"11"
);
}
}
...
...
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