Commit 23e0c2e7 by jianan

N22薪资单接口优化

parent ce949707
...@@ -952,6 +952,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -952,6 +952,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
String d = ""; String d = "";
List<SalaryDetails> salaryDetailsList = staffSalaryDetails.getSalaryDetailsLIST(); List<SalaryDetails> salaryDetailsList = staffSalaryDetails.getSalaryDetailsLIST();
// 过滤掉销售业绩是0的元素
salaryDetailsList = salaryDetailsList.stream()
.filter((SalaryDetails i) -> !Double.valueOf("0").equals(i.getCommission())
)
.collect(Collectors.toList());
// 1.只取SalaryType=业绩佣金和加扣款项的元素 // 1.只取SalaryType=业绩佣金和加扣款项的元素
salaryDetailsList = salaryDetailsList.stream() salaryDetailsList = salaryDetailsList.stream()
.filter((SalaryDetails i) -> .filter((SalaryDetails i) ->
...@@ -972,13 +978,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -972,13 +978,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
} }
responseVO.setD(String.valueOf(total_tax)); responseVO.setD(String.valueOf(total_tax));
// 税后佣金 // 税后佣金
Double after_tax_comis = 0D; Double after_tax_comis = salaryDetailsList.get(0).getAfter_tax_comis();
for (SalaryDetails item : salaryDetailsList) {
if (!Double.valueOf(0D).equals(item.getCommission())) {
after_tax_comis = item.getAfter_tax_comis();
break;
}
}
// 预扣率 // 预扣率
String rate = this.getRate(salaryDetailsList.get(0).getTotal_commission()); String rate = this.getRate(salaryDetailsList.get(0).getTotal_commission());
responseVO.setRate(rate); responseVO.setRate(rate);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment