治理指数数据查询接口修改

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1130,7 +1130,7 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
         ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getAgencyId());
         if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) {
-
+            if (OrgConstant.PROVINCE.equals(agencyDTO.getLevel()) || OrgConstant.CITY.equals(agencyDTO.getLevel()) || OrgConstant.DISTRICT.equals(agencyDTO.getLevel())) {
                 List<String> subAgencyIds = indexService.getAgencyByAreaCodeAgencyId(formDTO.getAgencyId(), agencyDTO.getAreaCode());
                 if (CollectionUtils.isEmpty(subAgencyIds)) {
                     subAgencyIds = new ArrayList<>();
@@ -1163,6 +1163,7 @@ public class DataStatsServiceImpl implements DataStatsService {
                     return resultDTO;
                 }
             }
+        }
         //1.按日期查询当前组织事件治理指数
         List<String> agencyIds = new ArrayList<>();
         agencyIds.add(formDTO.getAgencyId());
@@ -1381,6 +1382,7 @@ public class DataStatsServiceImpl implements DataStatsService {
         if (OrgConstant.AGENCY.equals(formDTO.getOrgType())) {
             ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getOrgId());
             if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) {
+                if (OrgConstant.PROVINCE.equals(agencyDTO.getLevel()) || OrgConstant.CITY.equals(agencyDTO.getLevel()) || OrgConstant.DISTRICT.equals(agencyDTO.getLevel())) {
                     ScreenGovernRankDataDailyDTO governData = indexService.getGovernRank(formDTO.getOrgId(), agencyDTO.getAreaCode(), formDTO.getDateId());
                     resultDTO.setGovernRatio(getPercentage(governData.getGovernCount(), governData.getClosedCount()));
                     resultDTO.setResolvedRatio(getPercentage(governData.getResolvedCount(), governData.getClosedCount()));
@@ -1389,6 +1391,7 @@ public class DataStatsServiceImpl implements DataStatsService {
                     return resultDTO;
                 }
             }
+        }
 
         //1.按类型、日期查询治理指数下响应解决满意自治四个统计率
         GovrnRatioResultDTO dto = indexService.governRatio(formDTO);