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
9a400df3
Commit
9a400df3
authored
Aug 19, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.8-审核模板变更,改变逻辑
parent
d372983b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
61 additions
and
51 deletions
+61
-51
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+61
-51
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
9a400df3
...
...
@@ -1241,25 +1241,35 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
@Override
public
R
<
String
>
getSixJobByAudit
()
{
// 获取所有需要反馈的任务id
// 社保 type 1:社保;2:医保
List
<
TSocialInfo
>
socialList
=
tSocialInfoService
.
getSocialSoldierYgsByAudit
();
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
this
.
doAuditCoreByType
(
socialList
,
CommonConstants
.
ONE_INT
);
}
// 医保
List
<
TSocialInfo
>
socialYsdList
=
tSocialInfoService
.
getSocialSoldierYsdByAudit
();
if
(
socialYsdList
!=
null
&&
!
socialYsdList
.
isEmpty
())
{
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
socialList
.
addAll
(
socialYsdList
);
}
else
{
socialList
=
socialYsdList
;
this
.
doAuditCoreByType
(
socialYsdList
,
CommonConstants
.
TWO_INT
);
}
return
R
.
ok
();
}
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
/**
* @param socialList
* @param type 1:社保;2:医保
* @Description: 整合社保与医保
* @Author: hgw
* @Date: 2024/8/16 17:43
* @return: void
**/
private
void
doAuditCoreByType
(
List
<
TSocialInfo
>
socialList
,
int
type
)
{
Map
<
String
,
TSocialInfo
>
idCardMap
=
new
HashMap
<>();
Set
<
String
>
addIdSet
=
new
HashSet
<>();
for
(
TSocialInfo
socialInfo
:
socialList
)
{
if
(
Common
.
isNotNull
(
socialInfo
.
getYgsAddId
()))
{
if
(
type
==
1
&&
Common
.
isNotNull
(
socialInfo
.
getYgsAddId
()))
{
addIdSet
.
add
(
socialInfo
.
getYgsAddId
());
idCardMap
.
put
(
socialInfo
.
getYgsAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
}
if
(
Common
.
isNotNull
(
socialInfo
.
getYsdAddId
()))
{
}
else
if
(
type
==
2
&&
Common
.
isNotNull
(
socialInfo
.
getYsdAddId
()))
{
addIdSet
.
add
(
socialInfo
.
getYsdAddId
());
idCardMap
.
put
(
socialInfo
.
getYsdAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
}
...
...
@@ -1282,7 +1292,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
conn
.
setConnectTimeout
(
30
*
1000
);
in
=
conn
.
getInputStream
();
// 实际读取文件内容
this
.
readZip
(
in
,
idCardMap
,
errorMap
,
doAddId
);
this
.
readZip
(
in
,
idCardMap
,
errorMap
,
doAddId
,
type
);
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
@@ -1298,11 +1308,9 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
}
}
return
R
.
ok
();
}
public
R
<
List
<
TSocialSoldierReturnAuditErrorVo
>>
readZip
(
InputStream
inputStream
,
Map
<
String
,
TSocialInfo
>
idCardMap
,
Map
<
String
,
FailReasonConfig
>
errorMap
,
String
doAddId
)
{
,
Map
<
String
,
FailReasonConfig
>
errorMap
,
String
doAddId
,
int
type
)
{
TSocialSoldierReturnAuditErrorVo
vo
;
List
<
TSocialSoldierReturnAuditErrorVo
>
voList
=
new
ArrayList
<>();
XSSFWorkbook
sheets
=
null
;
...
...
@@ -1461,7 +1469,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
}
if
(!
voList
.
isEmpty
())
{
importTSocialSoldierByAudit
(
voList
,
idCardMap
,
errorMap
,
doAddId
);
importTSocialSoldierByAudit
(
voList
,
idCardMap
,
errorMap
,
doAddId
,
type
);
}
return
R
.
ok
(
voList
);
}
...
...
@@ -1759,7 +1767,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
* @return: void
**/
private
void
importTSocialSoldierByAudit
(
List
<
TSocialSoldierReturnAuditErrorVo
>
excelVOList
,
Map
<
String
,
TSocialInfo
>
idCardMap
,
Map
<
String
,
FailReasonConfig
>
errorMap
,
String
doAddId
)
{
,
Map
<
String
,
FailReasonConfig
>
errorMap
,
String
doAddId
,
int
type
)
{
// 个性化校验逻辑
// 执行数据插入操作 组装
TSocialSoldierReturnAuditErrorVo
excel
;
...
...
@@ -1770,6 +1778,9 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
TSocialInfo
updateSocial
;
// true养工失 false 医生大
boolean
typeFlag
=
true
;
if
(
type
==
2
)
{
typeFlag
=
false
;
}
FailReasonConfig
failConfig
;
String
ygsHandleStatus
;
String
ysdHandleStatus
;
...
...
@@ -1806,7 +1817,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
auditRemark
=
excel
.
getYgsOperation
();
if
(
Common
.
isEmpty
(
auditRemark
))
{
auditRemark
=
excel
.
getYsdRemark
();
typeFlag
=
false
;
}
if
(
Common
.
isNotNull
(
empIdCard
))
{
title
=
"社保"
;
...
...
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