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
bd3223e6
Commit
bd3223e6
authored
Aug 20, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.8' into MVP1.6.8
parents
d6c4e422
898c3360
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
65 additions
and
52 deletions
+65
-52
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+61
-51
application-dev.yml
...al/yifu-social-biz/src/main/resources/application-dev.yml
+4
-1
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
bd3223e6
...
@@ -1241,25 +1241,35 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -1241,25 +1241,35 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
@Override
@Override
public
R
<
String
>
getSixJobByAudit
()
{
public
R
<
String
>
getSixJobByAudit
()
{
// 获取所有需要反馈的任务id
// 获取所有需要反馈的任务id
// 社保 type 1:社保;2:医保
List
<
TSocialInfo
>
socialList
=
tSocialInfoService
.
getSocialSoldierYgsByAudit
();
List
<
TSocialInfo
>
socialList
=
tSocialInfoService
.
getSocialSoldierYgsByAudit
();
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
this
.
doAuditCoreByType
(
socialList
,
CommonConstants
.
ONE_INT
);
}
// 医保
List
<
TSocialInfo
>
socialYsdList
=
tSocialInfoService
.
getSocialSoldierYsdByAudit
();
List
<
TSocialInfo
>
socialYsdList
=
tSocialInfoService
.
getSocialSoldierYsdByAudit
();
if
(
socialYsdList
!=
null
&&
!
socialYsdList
.
isEmpty
())
{
if
(
socialYsdList
!=
null
&&
!
socialYsdList
.
isEmpty
())
{
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
this
.
doAuditCoreByType
(
socialYsdList
,
CommonConstants
.
TWO_INT
);
socialList
.
addAll
(
socialYsdList
);
}
else
{
socialList
=
socialYsdList
;
}
}
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
<>();
Map
<
String
,
TSocialInfo
>
idCardMap
=
new
HashMap
<>();
Set
<
String
>
addIdSet
=
new
HashSet
<>();
Set
<
String
>
addIdSet
=
new
HashSet
<>();
for
(
TSocialInfo
socialInfo
:
socialList
)
{
for
(
TSocialInfo
socialInfo
:
socialList
)
{
if
(
Common
.
isNotNull
(
socialInfo
.
getYgsAddId
()))
{
if
(
type
==
1
&&
Common
.
isNotNull
(
socialInfo
.
getYgsAddId
()))
{
addIdSet
.
add
(
socialInfo
.
getYgsAddId
());
addIdSet
.
add
(
socialInfo
.
getYgsAddId
());
idCardMap
.
put
(
socialInfo
.
getYgsAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
idCardMap
.
put
(
socialInfo
.
getYgsAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
}
}
else
if
(
type
==
2
&&
Common
.
isNotNull
(
socialInfo
.
getYsdAddId
()))
{
if
(
Common
.
isNotNull
(
socialInfo
.
getYsdAddId
()))
{
addIdSet
.
add
(
socialInfo
.
getYsdAddId
());
addIdSet
.
add
(
socialInfo
.
getYsdAddId
());
idCardMap
.
put
(
socialInfo
.
getYsdAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
idCardMap
.
put
(
socialInfo
.
getYsdAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
}
}
...
@@ -1282,7 +1292,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -1282,7 +1292,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
conn
.
setConnectTimeout
(
30
*
1000
);
conn
.
setConnectTimeout
(
30
*
1000
);
in
=
conn
.
getInputStream
();
in
=
conn
.
getInputStream
();
// 实际读取文件内容
// 实际读取文件内容
this
.
readZip
(
in
,
idCardMap
,
errorMap
,
doAddId
);
this
.
readZip
(
in
,
idCardMap
,
errorMap
,
doAddId
,
type
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
...
@@ -1298,11 +1308,9 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -1298,11 +1308,9 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
}
}
}
}
}
return
R
.
ok
();
}
public
R
<
List
<
TSocialSoldierReturnAuditErrorVo
>>
readZip
(
InputStream
inputStream
,
Map
<
String
,
TSocialInfo
>
idCardMap
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
;
TSocialSoldierReturnAuditErrorVo
vo
;
List
<
TSocialSoldierReturnAuditErrorVo
>
voList
=
new
ArrayList
<>();
List
<
TSocialSoldierReturnAuditErrorVo
>
voList
=
new
ArrayList
<>();
XSSFWorkbook
sheets
=
null
;
XSSFWorkbook
sheets
=
null
;
...
@@ -1461,7 +1469,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -1461,7 +1469,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
}
}
}
if
(!
voList
.
isEmpty
())
{
if
(!
voList
.
isEmpty
())
{
importTSocialSoldierByAudit
(
voList
,
idCardMap
,
errorMap
,
doAddId
);
importTSocialSoldierByAudit
(
voList
,
idCardMap
,
errorMap
,
doAddId
,
type
);
}
}
return
R
.
ok
(
voList
);
return
R
.
ok
(
voList
);
}
}
...
@@ -1759,7 +1767,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -1759,7 +1767,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
* @return: void
* @return: void
**/
**/
private
void
importTSocialSoldierByAudit
(
List
<
TSocialSoldierReturnAuditErrorVo
>
excelVOList
,
Map
<
String
,
TSocialInfo
>
idCardMap
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
;
TSocialSoldierReturnAuditErrorVo
excel
;
...
@@ -1770,6 +1778,9 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -1770,6 +1778,9 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
TSocialInfo
updateSocial
;
TSocialInfo
updateSocial
;
// true养工失 false 医生大
// true养工失 false 医生大
boolean
typeFlag
=
true
;
boolean
typeFlag
=
true
;
if
(
type
==
2
)
{
typeFlag
=
false
;
}
FailReasonConfig
failConfig
;
FailReasonConfig
failConfig
;
String
ygsHandleStatus
;
String
ygsHandleStatus
;
String
ysdHandleStatus
;
String
ysdHandleStatus
;
...
@@ -1806,7 +1817,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -1806,7 +1817,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
auditRemark
=
excel
.
getYgsOperation
();
auditRemark
=
excel
.
getYgsOperation
();
if
(
Common
.
isEmpty
(
auditRemark
))
{
if
(
Common
.
isEmpty
(
auditRemark
))
{
auditRemark
=
excel
.
getYsdRemark
();
auditRemark
=
excel
.
getYsdRemark
();
typeFlag
=
false
;
}
}
if
(
Common
.
isNotNull
(
empIdCard
))
{
if
(
Common
.
isNotNull
(
empIdCard
))
{
title
=
"社保"
;
title
=
"社保"
;
...
...
yifu-social/yifu-social-biz/src/main/resources/application-dev.yml
View file @
bd3223e6
...
@@ -55,3 +55,6 @@ spring:
...
@@ -55,3 +55,6 @@ spring:
soldier
:
soldier
:
authorizations
:
Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmODA2ZjRlYzYzZjY0NjVlOGFlZjRmZmVlOTYwMzcxNiIsInN1YiI6IjIiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLmtYvor5UiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiMiIsIm5iZiI6MTcxMjg5Mjk1OCwiZXhwIjoxNzIzMjYwOTU4LCJpYXQiOjE3MTI4OTI5NTh9.oTmhLfv1tLq8aPOfO3LeqM1IDYT76YGXkqpz3dwBX4M
authorizations
:
Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmODA2ZjRlYzYzZjY0NjVlOGFlZjRmZmVlOTYwMzcxNiIsInN1YiI6IjIiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLmtYvor5UiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiMiIsIm5iZiI6MTcxMjg5Mjk1OCwiZXhwIjoxNzIzMjYwOTU4LCJpYXQiOjE3MTI4OTI5NTh9.oTmhLfv1tLq8aPOfO3LeqM1IDYT76YGXkqpz3dwBX4M
urlPre
:
http://172.16.24.66:55555
urlPre
:
http://172.16.24.66:55555
#线上社保士兵,一般不允许用,用之前要清理测试环境当月的社保自动化数据,否则有可能产生费用
#authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2MzcwYWIyZDRhZTI0NjQ2YTg0MTE0Mzk1Y2M2MTkzMiIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcxNjE3OTIxOSwiZXhwIjoxNzI2NTQ3MjE5LCJpYXQiOjE3MTYxNzkyMTl9.Ei-52hRlfMLXLzpzmbP2xCVFZKE5sHHexzfX5PtmZ_M
#urlPre: http://60.168.131.18:55555
\ No newline at end of file
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