薪资单-查询保单明细报null

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

@@ -443,6 +443,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         String loginName = null;
         String years = null;
         String month = null;
+        String grade = "";
         for (String key : group.keySet()) {
 
             System.out.println("Key = " + key);
@@ -452,14 +453,15 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 monDtlAmount = list.get(0).getSumcommission();
                 monDtlRAmount = list.get(0).getAfter_tax_comis();
                 loginName = list.get(0).getLoginName();
+                grade = list.get(0).getGrade();
                 years = String.valueOf(list.get(0).getYear());
                 month = String.valueOf(list.get(0).getMonth());
 
                 PayScaleInfo payScaleInfo = new PayScaleInfo();
-                payScaleInfo.setMonDtlAmount(monDtlAmount);
+                payScaleInfo.setMonDtlAmount(monDtlAmount == null ? 0D : monDtlAmount);
                 payScaleInfo.setMonDtlItem("实发薪水");
-                payScaleInfo.setMonDtlRAmount(monDtlRAmount);
-                payScaleInfo.setDrpTitleCode(list.get(0).getGrade());
+                payScaleInfo.setMonDtlRAmount(monDtlRAmount == null ? 0D : monDtlRAmount);
+                payScaleInfo.setDrpTitleCode(grade == null ? "null" : grade);
                 payScaleInfo.setMonDtlPeriod(key);
                 payScaleInfo.setLoginName(loginName);
                 // 处理时间,作为接口/searchStaffSalaryDetails的查询入参
@@ -775,7 +777,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         WithdrawQueryInfo info = new WithdrawQueryInfo();
         info.setPractitionerId(requestVO.getPractitionerId());
         info.setPayoutYearmonth(this.getPayoutYearmonth(requestVO));
-        info.setCommissionPayoutStatus(Long.valueOf("2"));
+        info.setCommissionPayoutStatus(Long.valueOf("4"));
         List<WithdrawLabelInfo> withdraws = agmsFortuneDalService.transformForWithdrawLabel(info);
 
         // 有银盾在线佣金
@@ -825,9 +827,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         if (CollectionUtils.isNotEmpty(salaryDetailsList)) {
             // 代扣个人所得税
             Double total_tax = salaryDetailsList.get(0).getTotal_tax();
-            responseVO.setD(String.valueOf(total_tax));
-            System.out.println("看看报错1");
-            System.out.println(salaryDetailsList.get(0));
+            responseVO.setD(String.valueOf(total_tax == null ? "0" : total_tax));
 
             // 预扣率
             String rate = this.getRate(salaryDetailsList.get(0).getTotal_commission());
@@ -854,21 +854,28 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     }
 
     private String getRate(Double total_commission) {
+        String rate = "0";
+        if (total_commission == null) {
+            return rate;
+        }
+
         long l = (long) (total_commission * 100);
         if (0 < l && l <= 3600000) {
-            return "3";
+            rate = "3";
         } else if (3600000 < l && l <= 14400000) {
-            return "10";
+            rate = "10";
         } else if (14400000 < l && l <= 30000000) {
-            return "20";
+            rate = "20";
         } else if (30000000 < l && l <= 42000000) {
-            return "25";
+            rate = "25";
         } else if (42000000 < l && l <= 66000000) {
-            return "30";
+            rate = "30";
         } else if (66000000 < l && l <= 96000000) {
-            return "35";
+            rate = "35";
+        } else {
+            rate = "45";
         }
-        return "45";
+        return rate;
     }
 
     private void getResponseMessage(OrganizationQueryResponseVO responseVO, List<PractitionerSubordinateSystemInfo> subordinateSystemInfoList, List<InsurerBranchDeptInfo> insurerBranchDeptInfoList, List<InsurerBranchInfo> insurerBranchInfoList) {