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
3acc35dd
Commit
3acc35dd
authored
Aug 29, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
申报修改
parent
d7fcaa90
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+2
-4
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
3acc35dd
...
@@ -1345,12 +1345,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
...
@@ -1345,12 +1345,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
DOWN_LINE_STRING
+
infoVo
.
getProvidentCreateMonth
().
trim
()
+
infoVo
.
getProvidentCreateMonth
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
DOWN_LINE_STRING
+
Math
.
round
(
BigDecimalUtils
.
safeAdd
(
infoVo
.
getProvidentSum
()).
doubleValue
()
*
100
)
/
100.0
);
+
Math
.
round
(
BigDecimalUtils
.
safeAdd
(
infoVo
.
get
Unit
ProvidentSum
()).
doubleValue
()
*
100
)
/
100.0
);
}
}
//存在公积金缴费数据
//存在公积金缴费数据
if
(
null
!=
paymentInfo
&&
((
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getProvidentSum
()).
compareTo
(
BigDecimal
.
ZERO
)
!=
0
)
if
(
null
!=
paymentInfo
&&
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitProvidentSum
()).
compareTo
(
BigDecimal
.
ZERO
)
!=
0
)
{
||
((
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getSocialSum
()).
compareTo
(
BigDecimal
.
ZERO
)
==
0
)
&&
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getProvidentSum
()).
compareTo
(
BigDecimal
.
ZERO
)
==
0
)))
{
//允许覆盖,但已核准表或工资结算或已锁定不允许覆盖
//允许覆盖,但已核准表或工资结算或已锁定不允许覆盖
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
...
...
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