手工录入的薪资单显示银盾在线的保单列表

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

@@ -891,21 +891,26 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     public SearchStaffSalaryDetailsResponseBody searchStaffSalaryDetails(SearchStaffSalaryDetailsRequestBody requestVO) {
     public SearchStaffSalaryDetailsResponseBody searchStaffSalaryDetails(SearchStaffSalaryDetailsRequestBody requestVO) {
 
 
         SearchStaffSalaryDetailsResponseBody responseBody = new SearchStaffSalaryDetailsResponseBody();
         SearchStaffSalaryDetailsResponseBody responseBody = new SearchStaffSalaryDetailsResponseBody();
+        responseBody.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("820001")));
+
         // 检查请求参数
         // 检查请求参数
         if (StringUtils.isBlank(requestVO.getYears())||StringUtils.isBlank(requestVO.getMonth())) {
         if (StringUtils.isBlank(requestVO.getYears())||StringUtils.isBlank(requestVO.getMonth())) {
             responseBody.setCommonResult(new CommonResult(false, "查询年月不能为空"));
             responseBody.setCommonResult(new CommonResult(false, "查询年月不能为空"));
             return responseBody;
             return responseBody;
         }
         }
-        // 调接口
-        SearchStaffSalaryDetailsResponseVO searchStaffSalaryDetailsResponseVO = n22SalaryService.searchStaffSalaryDetails(requestVO);
-        if ("查询成功".equals(searchStaffSalaryDetailsResponseVO.getResponseHead().getMessage())) {
-            responseBody = searchStaffSalaryDetailsResponseVO.getResponseBody();
+        if ("1".equals(requestVO.getIsBasic())) {
             // 查询银盾在线佣金的保单列表
             // 查询银盾在线佣金的保单列表
             this.queryYdOnlineCommission(requestVO, responseBody);
             this.queryYdOnlineCommission(requestVO, responseBody);
-            responseBody.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
-
         } else {
         } else {
-            responseBody.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("820001")));
+            // 调N22接口
+            SearchStaffSalaryDetailsResponseVO searchStaffSalaryDetailsResponseVO = n22SalaryService.searchStaffSalaryDetails(requestVO);
+            if ("查询成功".equals(searchStaffSalaryDetailsResponseVO.getResponseHead().getMessage())) {
+                responseBody = searchStaffSalaryDetailsResponseVO.getResponseBody();
+                // 查询银盾在线佣金的保单列表
+                this.queryYdOnlineCommission(requestVO, responseBody);
+                responseBody.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+
+            }
         }
         }
         return responseBody;
         return responseBody;
     }
     }
@@ -922,13 +927,22 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             Long  withdrawId = withdraws.get(0).getWithdrawId();
             Long  withdrawId = withdraws.get(0).getWithdrawId();
 
 
             List<OtherCommission> otherCommissionList = responseBody.getOtherCommissionList();
             List<OtherCommission> otherCommissionList = responseBody.getOtherCommissionList();
-            for (OtherCommission otherCommission : otherCommissionList) {
-                // 此项为银盾在线佣金
-                if ("12C24EDF-83D7-081C-AE2C-085031C4DCAF".equals(otherCommission.getProject_Id())) {
-                    //获取withdrewId
-                    otherCommission.setWithdrawedId(withdrawId);
+            if (CollectionUtils.isNotEmpty(otherCommissionList)) {
+                for (OtherCommission otherCommission : otherCommissionList) {
+                    // 此项为银盾在线佣金
+                    if ("12C24EDF-83D7-081C-AE2C-085031C4DCAF".equals(otherCommission.getProject_Id())) {
+                        //获取withdrewId
+                        otherCommission.setWithdrawedId(withdrawId);
+                    }
                 }
                 }
+            } else {
+                // 手工录入薪资单，List为空
+                otherCommissionList = new ArrayList<>();
+                OtherCommission otherCommission = new OtherCommission();
+                otherCommission.setWithdrawedId(withdrawId);
 
 
+                otherCommissionList.add(otherCommission);
+                responseBody.setOtherCommissionList(otherCommissionList);
             }
             }
         }
         }
 
 

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

@@ -17,4 +17,6 @@ public class SearchStaffSalaryDetailsRequestBody {
 
 
     private Long practitionerId;
     private Long practitionerId;
 
 
+    private String isBasic;
+
 }
 }