Commit 372e7fc0 by jianan

0715:after_tax_comis为0

parent 90d3e7d1
......@@ -825,7 +825,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
String d = "";
List<SalaryDetails> salaryDetailsList = staffSalaryDetails.getSalaryDetailsLIST();
// 1.过滤掉SalaryName=FYC的元素
// 1.只取SalaryType=业绩佣金和加扣款项的元素
salaryDetailsList = salaryDetailsList.stream()
.filter((SalaryDetails i) ->
("业绩佣金".equals(i.getSalaryType())
......@@ -836,9 +836,22 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
if (CollectionUtils.isNotEmpty(salaryDetailsList)) {
// 代扣个人所得税
Double total_tax = salaryDetailsList.get(0).getTotal_tax();
responseVO.setD(String.valueOf(total_tax == null ? "0" : total_tax));
Double total_tax = 0D;
for (SalaryDetails item : salaryDetailsList) {
if (!Double.valueOf(0D).equals(item.getTotal_tax())) {
total_tax = item.getTotal_tax();
break;
}
}
responseVO.setD(String.valueOf(total_tax));
// 税后佣金
Double after_tax_comis = 0D;
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());
responseVO.setRate(rate);
......@@ -851,6 +864,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
for (SalaryDetails item : salaryDetailsList) {
SalaryDetail target = new SalaryDetail();
BeanUtils.copyProperties(item, target);
target.setAfter_tax_comis(after_tax_comis);
list.add(target);
}
responseVO.setList(list);
......
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