Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java

@@ -86,4 +86,5 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
     CustomerGridDTO getGridInfo(@Param("gridId") String gridId);
 
     List<ScreenCustomerGridDTO> getSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
+    List<ScreenCustomerGridDTO> getAllSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
 }

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

@@ -2011,10 +2011,15 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
         }
 
         //2.查询组织信息，判断查询下级组织还是网格数据
-        ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport());
+        //2022.8.17 屏蔽查询组织、网格逻辑，直接以org库的组织网格为准
+        ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId(), formDTO.isExport());
         if (null == agencyGrid) {
             return new CustomerDataManageResultDTO();
         }
+        /*ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport());
+        if (null == agencyGrid) {
+            return new CustomerDataManageResultDTO();
+        }*/
         //组织或网格Id集合
         List<String> idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getOrgId).collect(Collectors.toList());
         formDTO.setDataType(!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) ? OrgTypeEnum.AGENCY.getCode() : OrgTypeEnum.GRID.getCode());
@@ -2329,7 +2334,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
         }
 
         //2.查询组织信息，判断要查询下级是组织还是网格数据
-        ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId());
+        ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId(), false);
         if (null == agencyGrid) {
             return new ArrayList<>();
         }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -290,6 +290,6 @@ public interface GovOrgService {
     List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO);
     Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO);
 
-    ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId);
+    ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid);
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -1473,7 +1473,7 @@ public class GovOrgServiceImpl implements GovOrgService {
     }
 
     @Override
-    public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId) {
+    public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid) {
         ScreenAgencyOrGridListDTO resultDTO = new ScreenAgencyOrGridListDTO();
         List<ScreenAgencyOrGridListDTO.AgencyGrid> agencyGridList = new ArrayList<>();
         //1.查询组织信息
@@ -1485,10 +1485,22 @@ public class GovOrgServiceImpl implements GovOrgService {
         //2.根据组织级别判断查询直属组织或网格列表
         List<ScreenCustomerAgencyDTO> agencyList = new ArrayList<>();
         List<ScreenCustomerGridDTO> gridList = new ArrayList<>();
+        //组织级别为街道的查询下级所有网格
+        if (isGetSubAllGrid && (OrgLevelEnum.STREET.getCode().equals(dto.getLevel()))) {
+            gridList = customerGridDao.getAllSubGridList(customerId, agencyId);
+            List<ScreenAgencyOrGridListDTO.AgencyGrid> allGridList = new ArrayList<>();
+            gridList.forEach(gr -> {
+                ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
+                org.setOrgId(gr.getGridId());
+                org.setOrgName(gr.getGridName());
+                allGridList.add(org);
+            });
+            resultDTO.setAllGridList(allGridList);
+        }
         if (!"community".equals(dto.getLevel())) {
             //2-1.直属下级组织列表
             agencyList = customerAgencyDao.getSubAgencyListByAgency(customerId, agencyId);
-            agencyList.forEach(gr->{
+            agencyList.forEach(gr -> {
                 ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
                 org.setOrgId(gr.getAgencyId());
                 org.setOrgName(gr.getAgencyName());
@@ -1497,7 +1509,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         } else {
             //2-2.直属下级网格列表
             gridList = customerGridDao.getSubGridList(customerId, agencyId);
-            gridList.forEach(gr->{
+            gridList.forEach(gr -> {
                 ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
                 org.setOrgId(gr.getGridId());
                 org.setOrgName(gr.getGridName());

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml

@@ -194,6 +194,23 @@
             del_flag = '0'
         AND customer_id = #{customerId}
         AND pid = #{agencyId}
+        ORDER BY pid, grid_name
+    </select>
+
+    <select id="getAllSubGridList" resultType="com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO">
+        SELECT
+            customer_id AS customerId,
+            id AS gridId,
+            grid_name AS gridName,
+            pid AS parentAgencyId,
+            pids AS allParentIds
+        FROM
+            customer_grid
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND pids LIKE concat('%',#{agencyId},'%')
+        ORDER BY pid, grid_name
     </select>
 
 </mapper>