|
|
@@ -167,6 +167,8 @@ public class CockpitServiceImpl implements CockpitService {
|
|
|
if(OrgTypeEnum.SHEGN_LIAN_SHE.getCode().equals(org.getType())){
|
|
|
//统计省联社,获取每个地区行社的数据
|
|
|
orgGA38StatisticVos = cockpitMapper.selectOrgGA38(org.getPath(), date, 1);
|
|
|
+ orgGA38StatisticVos.sort(Comparator.comparing(OrgGA38StatisticVo::getReachRate));
|
|
|
+ Collections.reverse(orgGA38StatisticVos);
|
|
|
return orgGA38StatisticVos;
|
|
|
|
|
|
|
|
|
@@ -207,15 +209,17 @@ public class CockpitServiceImpl implements CockpitService {
|
|
|
|
|
|
if(OrgTypeEnum.DIQU_HANG_SHE.getCode().equals(org.getType()) || "地区行社".equals(org.getName())){
|
|
|
orgGA38StatisticVos = cockpitMapper.selectOrgGA38(org.getPath(), date, 2);
|
|
|
+ orgGA38StatisticVos.sort(Comparator.comparing(OrgGA38StatisticVo::getReachRate));
|
|
|
+ Collections.reverse(orgGA38StatisticVos);
|
|
|
return orgGA38StatisticVos;
|
|
|
}
|
|
|
|
|
|
if(OrgTypeEnum.HANG_SHE.getCode().equals(org.getType())){
|
|
|
//如果统计的具体行社,则要先查出所有网点
|
|
|
orgGA38StatisticVos = cockpitMapper.selectOrgGA38(org.getPath(), date, 3);
|
|
|
- return orgGA38StatisticVos;
|
|
|
}
|
|
|
-
|
|
|
+ orgGA38StatisticVos.sort(Comparator.comparing(OrgGA38StatisticVo::getReachRate));
|
|
|
+ Collections.reverse(orgGA38StatisticVos);
|
|
|
return orgGA38StatisticVos;
|
|
|
|
|
|
|