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
09643e9b
You need to sign in or sign up before continuing.
Commit
09643e9b
authored
Aug 18, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.7' into MVP1.5.7
parents
274047cd
0a61347e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+1
-1
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+7
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
09643e9b
...
@@ -288,7 +288,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -288,7 +288,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
/*if ( Common.isEmpty(domain.getCreateType())){
/*if ( Common.isEmpty(domain.getCreateType())){
return "创建类型不可为空";
return "创建类型不可为空";
}*/
}*/
if
(
domain
.
getCreateType
().
equals
(
ArchivesConstants
.
CONTRACT_CREATE_TYPE
)
if
(
ArchivesConstants
.
CONTRACT_CREATE_TYPE
.
equals
(
domain
.
getCreateType
()
)
&&
(
Common
.
isEmpty
(
domain
.
getBusinessPrimaryType
())
&&
(
Common
.
isEmpty
(
domain
.
getBusinessPrimaryType
())
||
Common
.
isEmpty
(
domain
.
getBusinessSecondType
())
||
Common
.
isEmpty
(
domain
.
getBusinessSecondType
())
||
Common
.
isEmpty
(
domain
.
getBusinessThirdType
()))){
||
Common
.
isEmpty
(
domain
.
getBusinessThirdType
()))){
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
09643e9b
...
@@ -1634,6 +1634,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1634,6 +1634,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//地区数据
//地区数据
HashMap
<
String
,
String
>
areaMap
=
new
HashMap
<>();
HashMap
<
String
,
String
>
areaMap
=
new
HashMap
<>();
HashMap
<
String
,
String
>
areaMap2
=
new
HashMap
<>();
HashMap
<
String
,
String
>
areaMap2
=
new
HashMap
<>();
//公积金唯一性检验条件:身份证编码+公积金缴纳月份
HashMap
<
String
,
Object
>
paymentInfoMap
=
new
HashMap
<>();
R
<
AreaVo
>
areaListR
=
upmsDaprUtils
.
getAreaListR
();
R
<
AreaVo
>
areaListR
=
upmsDaprUtils
.
getAreaListR
();
if
(
Common
.
isNotNull
(
areaListR
))
{
if
(
Common
.
isNotNull
(
areaListR
))
{
AreaVo
areaList
=
areaListR
.
getData
();
AreaVo
areaList
=
areaListR
.
getData
();
...
@@ -1688,7 +1690,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1688,7 +1690,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
*/
*/
private
void
saveData
()
{
private
void
saveData
()
{
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
batchSavePaymentFundInfo
(
cachedDataList
,
errorMessageList
,
batchInsertList
,
areaMap
,
areaMap2
,
domainMap
);
batchSavePaymentFundInfo
(
cachedDataList
,
errorMessageList
,
batchInsertList
,
areaMap
,
areaMap2
,
domainMap
,
paymentInfoMap
);
log
.
info
(
"存储数据库成功!"
);
log
.
info
(
"存储数据库成功!"
);
}
}
}).
sheet
().
doRead
();
}).
sheet
().
doRead
();
...
@@ -1709,7 +1712,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1709,7 +1712,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
private
void
batchSavePaymentFundInfo
(
List
<
TPaymentInfoVo
>
list
,
List
<
ErrorDetailVO
>
errorMessageList
,
private
void
batchSavePaymentFundInfo
(
List
<
TPaymentInfoVo
>
list
,
List
<
ErrorDetailVO
>
errorMessageList
,
List
<
TPaymentInfo
>
batchInsertList
,
HashMap
<
String
,
String
>
areaMap
,
List
<
TPaymentInfo
>
batchInsertList
,
HashMap
<
String
,
String
>
areaMap
,
HashMap
<
String
,
String
>
areaMap2
,
Map
<
String
,
TSettleDomainSelectVo
>
domainMap
)
{
HashMap
<
String
,
String
>
areaMap2
,
Map
<
String
,
TSettleDomainSelectVo
>
domainMap
,
HashMap
<
String
,
Object
>
paymentInfoMap
)
{
try
{
try
{
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
TPaymentInfo
paymentInfo
=
null
;
TPaymentInfo
paymentInfo
=
null
;
...
@@ -1731,8 +1735,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1731,8 +1735,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//已存在社保缴费库数据 非删除状态
//已存在社保缴费库数据 非删除状态
List
<
TPaymentInfo
>
paymentInfos
=
baseMapper
.
selectListForPaymentImport1
(
monthList
,
idcards
);
List
<
TPaymentInfo
>
paymentInfos
=
baseMapper
.
selectListForPaymentImport1
(
monthList
,
idcards
);
//公积金唯一性检验条件:身份证编码+公积金缴纳月份
HashMap
<
String
,
Object
>
paymentInfoMap
=
new
HashMap
<>();
if
(
Common
.
isNotNull
(
paymentInfos
))
{
if
(
Common
.
isNotNull
(
paymentInfos
))
{
for
(
TPaymentInfo
info
:
paymentInfos
)
{
for
(
TPaymentInfo
info
:
paymentInfos
)
{
paymentInfoMap
.
put
(
info
.
getProvidentPayAddr
()
paymentInfoMap
.
put
(
info
.
getProvidentPayAddr
()
...
...
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