agms分公司寿险数据排序问题2

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsDashboardServiceImpl.java

@@ -203,20 +203,29 @@ public class AgmsDashboardServiceImpl implements AgmsDashboardService {
 
 
         if ("life".equals(category)) {
         if ("life".equals(category)) {
             if ("b".equals(type)) {
             if ("b".equals(type)) {
-                searchStaffAchievementRequestBody.setSearchtype("3");
+
                 searchStaffAchievementRequestBody.setIsdown("1");
                 searchStaffAchievementRequestBody.setIsdown("1");
 
 
                 String organizationIds = systemConfigService.getSingleConfigValue("N22_Organization_ID");
                 String organizationIds = systemConfigService.getSingleConfigValue("N22_Organization_ID");
-                // 机构数据根据机构id循环调接口查询
+                // 循环查分公司
                 for (String organizationId :organizationIds.split(",")){
                 for (String organizationId :organizationIds.split(",")){
-
+                    searchStaffAchievementRequestBody.setSearchtype("3");
                     searchStaffAchievementRequestBody.setOrganization_id(organizationId);
                     searchStaffAchievementRequestBody.setOrganization_id(organizationId);
 
 
                     searchStaffAchievementResponseVO = n22SalaryService.searchStaffAchievement(searchStaffAchievementRequestBody);
                     searchStaffAchievementResponseVO = n22SalaryService.searchStaffAchievement(searchStaffAchievementRequestBody);
                     List<Achieve> achieves = n22SalaryService.searchStaffAchievementGetAchieveList(searchStaffAchievementResponseVO);
                     List<Achieve> achieves = n22SalaryService.searchStaffAchievementGetAchieveList(searchStaffAchievementResponseVO);
                     achieveList.addAll(achieves);
                     achieveList.addAll(achieves);
                 }
                 }
+                String FRIds = systemConfigService.getSingleConfigValue("N22_FR_ID");
+                // 循环查渠道机构
+                for (String FRId :FRIds.split(",")){
+                    searchStaffAchievementRequestBody.setSearchtype("2");
+                    searchStaffAchievementRequestBody.setRolegroup_id(FRId);
 
 
+                    searchStaffAchievementResponseVO = n22SalaryService.searchStaffAchievement(searchStaffAchievementRequestBody);
+                    List<Achieve> achieves = n22SalaryService.searchStaffAchievementGetAchieveList(searchStaffAchievementResponseVO);
+                    achieveList.addAll(achieves);
+                }
             } else {
             } else {
                 searchStaffAchievementRequestBody.setSearchtype("2");
                 searchStaffAchievementRequestBody.setSearchtype("2");
                 searchStaffAchievementRequestBody.setIsdown("0");
                 searchStaffAchievementRequestBody.setIsdown("0");