过滤掉 "二年续期佣金"，打印一些报错

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -482,6 +482,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     }
 
     private void handleYearsAndMonth(String years, String month, PayScaleInfo payScaleInfo) {
+
+        System.out.println("看看报错二");
+        System.out.println(years);
+        System.out.println(month);
+        System.out.println(payScaleInfo);
+
         Integer mon = Integer.valueOf(month);
         Integer year = Integer.valueOf(years);
         if (mon == 11) {
@@ -712,6 +718,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO();
 
         if ("查询成功".equals(salaryDetailsSearchResponseVO.getResponseHead().getMessage())) {
+
             SalaryDetailsSearchResponseBody salaryDetails = salaryDetailsSearchResponseVO.getResponseBody();
             this.createQuerySalaryDetailResponseVO(responseVO, salaryDetails);
             responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
@@ -823,12 +830,19 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         if (CollectionUtils.isNotEmpty(salaryDetailsList)) {
             // 代扣个人所得税
             Double total_tax = salaryDetailsList.get(0).getTotal_tax();
-            responseVO.setD(total_tax.toString());
+            responseVO.setD(String.valueOf(total_tax));
+            System.out.println("看看报错1");
+            System.out.println(salaryDetailsList.get(0));
+
             // 预扣率
             String rate = this.getRate(salaryDetailsList.get(0).getTotal_commission());
             responseVO.setRate(rate);
             // 佣金合计
             for (SalaryDetails item : salaryDetailsList) {
+                if ("d771080c-5424-11e9-9745-00163e0040a8".equals(item.getProject_id())) {
+                    // 过滤掉salaryName: "二年续期佣金"
+                    continue;
+                }
                 abc = abc.add(BigDecimal.valueOf(item.getCommission()));
             }
             responseVO.setAbc(abc.toString());

yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleInfo.java

@@ -127,4 +127,24 @@ public class PayScaleInfo {
     public void setMonth(String month) {
         this.month = month;
     }
+
+    @Override
+    public String toString() {
+        return "PayScaleInfo{" +
+                "monShId=" + monShId +
+                ", salMstId='" + salMstId + '\'' +
+                ", drpTitleCode='" + drpTitleCode + '\'' +
+                ", monDtlType='" + monDtlType + '\'' +
+                ", monDtlItem='" + monDtlItem + '\'' +
+                ", monDtlPeriod='" + monDtlPeriod + '\'' +
+                ", monDtlAmount=" + monDtlAmount +
+                ", monDtlRAmount=" + monDtlRAmount +
+                ", createDate='" + createDate + '\'' +
+                ", createUser='" + createUser + '\'' +
+                ", pdfOssPath='" + pdfOssPath + '\'' +
+                ", loginName='" + loginName + '\'' +
+                ", years='" + years + '\'' +
+                ", month='" + month + '\'' +
+                '}';
+    }
 }

yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/SalaryDetails.java

@@ -63,4 +63,41 @@ public class SalaryDetails {
     private Double total_tax;
     private Double personal_tax;
     private Double after_tax_comis;
+
+    @Override
+    public String toString() {
+        return "SalaryDetails{" +
+                "Project_id='" + Project_id + '\'' +
+                ", SalaryName='" + SalaryName + '\'' +
+                ", Appl_No='" + Appl_No + '\'' +
+                ", CustomerName='" + CustomerName + '\'' +
+                ", SalaryType='" + SalaryType + '\'' +
+                ", PayPeriod='" + PayPeriod + '\'' +
+                ", Pol_Name_Chn='" + Pol_Name_Chn + '\'' +
+                ", commission=" + commission +
+                ", tax_commission=" + tax_commission +
+                ", Tax=" + Tax +
+                ", AfterTaxCommissionTax=" + AfterTaxCommissionTax +
+                ", GrantDate='" + GrantDate + '\'' +
+                ", Paid_Status='" + Paid_Status + '\'' +
+                ", Year=" + Year +
+                ", Month='" + Month + '\'' +
+                ", RoleGroupDescription='" + RoleGroupDescription + '\'' +
+                ", LoginName='" + LoginName + '\'' +
+                ", StaffName='" + StaffName + '\'' +
+                ", grade='" + grade + '\'' +
+                ", AddFyc='" + AddFyc + '\'' +
+                ", CheckStatus=" + CheckStatus +
+                ", CheckDate='" + CheckDate + '\'' +
+                ", sumcommission=" + sumcommission +
+                ", tax_free_comis=" + tax_free_comis +
+                ", value_add_tax=" + value_add_tax +
+                ", total_commission=" + total_commission +
+                ", total_personal_tax=" + total_personal_tax +
+                ", total_paid=" + total_paid +
+                ", total_tax=" + total_tax +
+                ", personal_tax=" + personal_tax +
+                ", after_tax_comis=" + after_tax_comis +
+                '}';
+    }
 }