Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-backend
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AutogeneralShanghai
yd-backend
Commits
23e0c2e7
Commit
23e0c2e7
authored
Aug 10, 2021
by
jianan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
N22薪资单接口优化
parent
ce949707
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
+8
-7
No files found.
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
View file @
23e0c2e7
...
...
@@ -952,6 +952,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
String
d
=
""
;
List
<
SalaryDetails
>
salaryDetailsList
=
staffSalaryDetails
.
getSalaryDetailsLIST
();
// 过滤掉销售业绩是0的元素
salaryDetailsList
=
salaryDetailsList
.
stream
()
.
filter
((
SalaryDetails
i
)
->
!
Double
.
valueOf
(
"0"
).
equals
(
i
.
getCommission
())
)
.
collect
(
Collectors
.
toList
());
// 1.只取SalaryType=业绩佣金和加扣款项的元素
salaryDetailsList
=
salaryDetailsList
.
stream
()
.
filter
((
SalaryDetails
i
)
->
...
...
@@ -972,13 +978,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
}
responseVO
.
setD
(
String
.
valueOf
(
total_tax
));
// 税后佣金
Double
after_tax_comis
=
0
D
;
for
(
SalaryDetails
item
:
salaryDetailsList
)
{
if
(!
Double
.
valueOf
(
0
D
).
equals
(
item
.
getCommission
()))
{
after_tax_comis
=
item
.
getAfter_tax_comis
();
break
;
}
}
Double
after_tax_comis
=
salaryDetailsList
.
get
(
0
).
getAfter_tax_comis
();
// 预扣率
String
rate
=
this
.
getRate
(
salaryDetailsList
.
get
(
0
).
getTotal_commission
());
responseVO
.
setRate
(
rate
);
...
...
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