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
c40ef474
Commit
c40ef474
authored
Feb 06, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
370f1bf2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
11 deletions
+13
-11
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+13
-11
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
c40ef474
...
...
@@ -513,10 +513,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(!
errorMessageList
.
isEmpty
())
{
boolean
isAllTrue
=
true
;
for
(
ErrorDetailVO
d
:
errorMessageList
)
{
try
{
if
(
Common
.
isEmpty
(
d
.
getResult
())
||
d
.
getResult
()
==
0
)
{
isAllTrue
=
false
;
break
;
}
}
catch
(
Exception
e
)
{
log
.
error
(
"缴费库导入异常:"
+
e
);
}
}
if
(
isAllTrue
)
{
errorMessageList
.
clear
();
...
...
@@ -2540,13 +2544,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
batchGsInsertList
.
put
(
UUID
.
randomUUID
().
toString
(),
payExists
);
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
))
{
payExists
.
setUnitMedicalMoney
(
infoVo
.
getUnitMedicalMoney
());
payExists
.
setPersonalMedicalMoney
(
infoVo
.
getPersonalMedicalMoney
());
payExists
.
setUnitBigmailmentMoney
(
infoVo
.
getUnitBigailmentMoney
());
payExists
.
setUnitMedicalSet
(
infoVo
.
getMedicalSet
());
payExists
.
setPersonalBigmailmentMoney
(
infoVo
.
getPersonalBigailmentMoney
());
payExists
.
setSocialSecurityNo
(
infoVo
.
getSocialSecurityNo
());
payExists
.
setUnitMedicalMoney
(
null
==
infoVo
.
getUnitMedicalMoney
()
?
BigDecimal
.
ZERO
:
infoVo
.
getUnitMedicalMoney
());
payExists
.
setPersonalMedicalMoney
(
null
==
infoVo
.
getPersonalMedicalMoney
()
?
BigDecimal
.
ZERO
:
infoVo
.
getPersonalMedicalMoney
());
payExists
.
setUnitBigmailmentMoney
(
null
==
infoVo
.
getUnitBigailmentMoney
()
?
BigDecimal
.
ZERO
:
infoVo
.
getUnitBigailmentMoney
());
payExists
.
setUnitMedicalSet
(
null
==
infoVo
.
getMedicalSet
()
?
BigDecimal
.
ZERO
:
infoVo
.
getMedicalSet
());
payExists
.
setPersonalBigmailmentMoney
(
null
==
infoVo
.
getPersonalBigailmentMoney
()
?
BigDecimal
.
ZERO
:
infoVo
.
getPersonalBigailmentMoney
());
payExists
.
setSocialSecurityNo
(
null
==
infoVo
.
getSocialSecurityNo
()
?
""
:
infoVo
.
getSocialSecurityNo
());
payExists
.
setUnitSocialSum
(
BigDecimalUtils
.
safeAdd
(
payExists
.
getUnitMedicalMoney
()
,
payExists
.
getUnitBigmailmentMoney
()
,
payExists
.
getUnitSocialSum
()));
...
...
@@ -2561,7 +2564,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists
.
getSocialHousehold
(),
payExists
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
"对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
continue
;
}
}
return
errorMessageList
;
...
...
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