大屏居民信息接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScreenPopulationController.java

@@ -1,10 +1,14 @@
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.commons.tools.annotation.ReportData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.epdc.form.EpdcScreenGridRankingFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleDetailFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO;
 import com.elink.esua.epdc.service.AppUserService;
@@ -38,6 +42,7 @@ public class ApiScreenPopulationController {
      * @Param [epdcScreenSelectPeopleFormDTO]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO>>
      **/
+    @ReportData
     @PostMapping("selectPeople")
     public Result<List<EpdcScreenSelectPeopleResultDTO>> selectPeople(@RequestBody EpdcScreenSelectPeopleFormDTO dto){
         ValidatorUtils.validateEntity(dto);
@@ -50,6 +55,7 @@ public class ApiScreenPopulationController {
      * @Param [dto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleDetailResultDTO>
      **/
+    @ReportData
     @PostMapping("selectPeopleDetail")
     public Result<EpdcScreenSelectPeopleDetailResultDTO> selectPeopleDetail(@RequestBody EpdcScreenSelectPeopleDetailFormDTO dto){
         ValidatorUtils.validateEntity(dto);
@@ -64,8 +70,36 @@ public class ApiScreenPopulationController {
      * @Description 获取所有组织机构信息
      * @Date 2020/1/28 11:50
      **/
+    @ReportData
     @GetMapping("getDeptTreeWithTypeKey")
     public Result<DeptOption> getDeptTreeWithTypeKey() {
         return appUserService.getDeptTreeWithTypeKey();
     }
+
+
+    /**
+     * @Description  房屋用途数据接口
+     * @Author songyunpeng
+     * @Date  2020/9/15
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO>
+     **/
+    @ReportData
+    @PostMapping("housingUse")
+    public Result<EpdcScreenHouseUseResultDTO> housingUse(){
+        return appUserService.housingUse();
+    }
+    /**
+     * @Description  网格排名
+     * @Author songyunpeng
+     * @Date  2020/9/15
+     * @Param [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO>
+     **/
+    @ReportData
+    @PostMapping("gridRanking")
+    public Result<List<EpdcScreenGridRankingResultDTO>> gridRanking(@RequestBody EpdcScreenGridRankingFormDTO dto){
+        ValidatorUtils.validateEntity(dto);
+        return appUserService.gridRanking(dto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -502,6 +502,23 @@ public interface UserFeignClient {
      **/
     @PostMapping(value = "app-user/screenPopulationInfo/selectPeopleDetail", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<EpdcScreenSelectPeopleDetailResultDTO> selectPeopleDetail(EpdcScreenSelectPeopleDetailFormDTO dto);
+    /**
+     * @Description  房屋用途数据接口
+     * @Author songyunpeng
+     * @Date  2020/9/16
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO>
+     **/
+    @PostMapping(value = "app-user/screenPopulationInfo/housingUse", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<EpdcScreenHouseUseResultDTO> housingUse();
 
-
+    /**
+     * @Description  网格排名
+     * @Author songyunpeng
+     * @Date  2020/9/15
+     * @Param [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO>
+     **/
+    @PostMapping(value = "app-user/screenPopulationInfo/gridRanking", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcScreenGridRankingResultDTO>> gridRanking(@RequestBody EpdcScreenGridRankingFormDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -242,4 +242,14 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<EpdcScreenSelectPeopleDetailResultDTO> selectPeopleDetail(EpdcScreenSelectPeopleDetailFormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "selectPeopleDetail", dto);
     }
+
+    @Override
+    public Result<EpdcScreenHouseUseResultDTO> housingUse() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "housingUse");
+    }
+
+    @Override
+    public Result<List<EpdcScreenGridRankingResultDTO>> gridRanking(EpdcScreenGridRankingFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "gridRanking", dto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -343,4 +343,20 @@ public interface AppUserService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
      **/
     Result<DeptOption> getDeptTreeWithTypeKey();
+    /**
+     * @Description   房屋用途数据接口
+     * @Author songyunpeng
+     * @Date  2020/9/16
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO>
+     **/
+    Result<EpdcScreenHouseUseResultDTO> housingUse();
+    /**
+     * @Description   网格排名
+     * @Author songyunpeng
+     * @Date  2020/9/16
+     * @Param [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO>
+     **/
+    Result<List<EpdcScreenGridRankingResultDTO>> gridRanking(EpdcScreenGridRankingFormDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1601,4 +1601,14 @@ public class AppUserServiceImpl implements AppUserService {
         return adminFeignClient.getDeptTreeWithTypeKey();
     }
 
+    @Override
+    public Result<EpdcScreenHouseUseResultDTO> housingUse() {
+        return userFeignClient.housingUse();
+    }
+
+    @Override
+    public Result<List<EpdcScreenGridRankingResultDTO>> gridRanking(EpdcScreenGridRankingFormDTO dto) {
+        return userFeignClient.gridRanking(dto);
+    }
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenGridRankingFormDTO.java

@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author songyunpeng
+ * @Description 大屏网格排名参数
+ * @create 2020-09-14
+ */
+@Data
+public class EpdcScreenGridRankingFormDTO {
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+
+    /**
+     * 排序依据
+     */
+    @NotBlank(message = "排序依据不能为空")
+    private String rankCategory;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenGridRankingResultDTO.java

@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+/**
+ * @author songyunpeng
+ * @Description 大屏房屋用途接口结果
+ * @create 2020-09-14
+ */
+@Data
+public class EpdcScreenGridRankingResultDTO {
+    /**
+     * 网格名
+     */
+    private String gridName;
+    /**
+     * 数量
+     */
+    private Integer total;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenHouseUseResultDTO.java

@@ -0,0 +1,58 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+/**
+ * @author songyunpeng
+ * @Description 大屏房屋用途接口结果
+ * @create 2020-09-14
+ */
+@Data
+public class EpdcScreenHouseUseResultDTO {
+    /**
+     * 房屋数量
+     */
+    private Integer houseNum;
+    /**
+     * 人口数量
+     */
+    private Integer populationNum;
+    /**
+     * 机动车数量
+     */
+    private Integer motorVehicleNum;
+    /**
+     * 党员
+     */
+    private Integer partyMemberNum;
+    /**
+     * 企业数量
+     */
+    private Integer enterpriseNum;
+    /**
+     * 租赁数量
+     */
+    private Integer rentNumber;
+    /**
+     * 自住数量
+     */
+    private Integer sinceTheLivingNumber;
+    /**
+     * 经营数量
+     */
+    private Integer businessNumber;
+    /**
+     * 租赁百分比
+     */
+    private Integer rentPercent;
+    /**
+     * 自住百分比
+     */
+    private Integer sinceTheLivingNumberPercent;
+    /**
+     * 经营百分比
+     */
+    private Integer businessPercent;
+
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/FamilyMember.java

@@ -17,8 +17,5 @@ public class FamilyMember {
      * 关系
      */
     private String relation;
-    /**
+
-     * 电话
-     */
-    private String phone;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcScreenPopulationInformationController.java

@@ -18,8 +18,11 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcScreenGridRankingFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleDetailFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO;
 import com.elink.esua.epdc.service.PopulationInformationService;
@@ -68,5 +71,29 @@ public class EpdcScreenPopulationInformationController {
     public Result<EpdcScreenSelectPeopleDetailResultDTO> selectPeopleDetail(@RequestBody EpdcScreenSelectPeopleDetailFormDTO dto){
         return populationInformationService.selectPeopleDetail(dto);
     }
+    /**
+     * @Description  房屋用途数据接口
+     * @Author songyunpeng
+     * @Date  2020/9/15
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO>
+     **/
+    @PostMapping("housingUse")
+    public Result<EpdcScreenHouseUseResultDTO> housingUse(){
+        return populationInformationService.housingUse();
+    }
+    /**
+     * @Description  网格排名
+     * @Author songyunpeng
+     * @Date  2020/9/15
+     * @Param [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO>
+     **/
+    @PostMapping("gridRanking")
+    public Result<List<EpdcScreenGridRankingResultDTO>> gridRanking(@RequestBody EpdcScreenGridRankingFormDTO dto){
+        return populationInformationService.gridRanking(dto);
+    }
+
+
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PopulationInformationDao.java

@@ -20,7 +20,10 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.PopulationInfoOverviewDTO;
 import com.elink.esua.epdc.dto.PopulationInformationDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcScreenGridRankingFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO;
 import com.elink.esua.epdc.entity.PopulationInformationEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -110,4 +113,20 @@ public interface PopulationInformationDao extends BaseDao<PopulationInformationE
      * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO>
      **/
     List<EpdcScreenSelectPeopleResultDTO> selectListPeople(EpdcScreenSelectPeopleFormDTO dto);
+    /**
+     * @Description  房屋用途数据接口
+     * @Author songyunpeng
+     * @Date  2020/9/15
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO>
+     **/
+    EpdcScreenHouseUseResultDTO selectHouseUseDataForScreen();
+    /**
+     * @Description  网格排名
+     * @Author songyunpeng
+     * @Date  2020/9/15
+     * @Param [dto]
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO>
+     **/
+    List<EpdcScreenGridRankingResultDTO> selectListGridRanking(EpdcScreenGridRankingFormDTO dto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PopulationInformationService.java

@@ -22,8 +22,11 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.PopulationInfoOverviewDTO;
 import com.elink.esua.epdc.dto.PopulationInformationDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcScreenGridRankingFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleDetailFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO;
 import com.elink.esua.epdc.entity.PopulationInformationEntity;
@@ -179,4 +182,20 @@ public interface PopulationInformationService extends BaseService<PopulationInfo
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleDetailResultDTO>
      **/
     Result<EpdcScreenSelectPeopleDetailResultDTO> selectPeopleDetail(EpdcScreenSelectPeopleDetailFormDTO dto);
+    /**
+     * @Description  房屋用途数据接口 
+     * @Author songyunpeng
+     * @Date  2020/9/15
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO>
+     **/
+    Result<EpdcScreenHouseUseResultDTO> housingUse();
+    /**
+     * @Description  网格排名 
+     * @Author songyunpeng
+     * @Date  2020/9/15
+     * @Param [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO>
+     **/
+    Result<List<EpdcScreenGridRankingResultDTO>> gridRanking(EpdcScreenGridRankingFormDTO dto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java

@@ -35,12 +35,10 @@ import com.elink.esua.epdc.dto.BaseResidentInformationExportDto;
 import com.elink.esua.epdc.dto.HousingInformationDTO;
 import com.elink.esua.epdc.dto.PopulationInfoOverviewDTO;
 import com.elink.esua.epdc.dto.PopulationInformationDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcScreenGridRankingFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleDetailFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleDetailResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.*;
-import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.FamilyMember;
-import com.elink.esua.epdc.dto.epdc.result.HousingInfo;
 import com.elink.esua.epdc.entity.HouseResidentEntity;
 import com.elink.esua.epdc.entity.HousingInformationEntity;
 import com.elink.esua.epdc.entity.PopulationInformationEntity;
@@ -372,7 +370,6 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl<Population
             FamilyMember familyMember = new FamilyMember();
             baseResidentInformationExportDtos.forEach(a -> {
                 familyMember.setName(a.getResidentsName());
-                familyMember.setPhone("");
                 switch (a.getHouseHeadRelation()){
                     case HouseHeadRelationConstant.CHILDREN :
                         familyMember.setRelation("子女");
@@ -400,6 +397,9 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl<Population
             }
             //居住人，人口信息从人口表拿
             PopulationInformationEntity populationInformationEntity = this.selectById(dto.getPopulationId());
+            if(populationInformationEntity==null){
+                return new Result<EpdcScreenSelectPeopleDetailResultDTO>().error("未查找到此人信息！");
+            }
             epdcScreenSelectPeopleDetailResultDTO.setName(populationInformationEntity.getResidentsName());
             epdcScreenSelectPeopleDetailResultDTO.setSex("0".equals(populationInformationEntity.getResidentsSex())?"女":"男");
             epdcScreenSelectPeopleDetailResultDTO.setAge("");
@@ -422,6 +422,27 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl<Population
         }
         return new Result<EpdcScreenSelectPeopleDetailResultDTO>().error("查询错误：身份标识参数无法匹配");
     }
+
+    @Override
+    public Result<EpdcScreenHouseUseResultDTO> housingUse() {
+        EpdcScreenHouseUseResultDTO epdcScreenHouseUseResultDTO = baseDao.selectHouseUseDataForScreen();
+        PopulationInfoOverviewDTO populationInfoOverview = this.getPopulationInfoOverview();
+        epdcScreenHouseUseResultDTO.setHouseNum(populationInfoOverview.getHouseNum());
+        epdcScreenHouseUseResultDTO.setPopulationNum(populationInfoOverview.getPopulationNum());
+        epdcScreenHouseUseResultDTO.setMotorVehicleNum(populationInfoOverview.getMotorVehicleNum());
+        epdcScreenHouseUseResultDTO.setPopulationNum(populationInfoOverview.getPopulationNum());
+        epdcScreenHouseUseResultDTO.setEnterpriseNum(populationInfoOverview.getBusiness());
+        return new Result<EpdcScreenHouseUseResultDTO>().ok(epdcScreenHouseUseResultDTO);
+    }
+
+    @Override
+    public Result<List<EpdcScreenGridRankingResultDTO>> gridRanking(EpdcScreenGridRankingFormDTO dto) {
+        int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize();
+        dto.setPageIndex(pageIndex);
+        List<EpdcScreenGridRankingResultDTO> data = baseDao.selectListGridRanking(dto);
+        return new Result<List<EpdcScreenGridRankingResultDTO>>().ok(data);
+    }
+
     private void setHouseUse(String houseUse,HousingInfo housingInfo){
         switch (houseUse){
             case HouseUseConstant.RENT :

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml

@@ -265,6 +265,51 @@
                 order by CREATED_TIME desc
                 LIMIT #{pageIndex},#{pageSize}
     </select>
+    <select id="selectHouseUseDataForScreen"
+            resultType="com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO">
+        select
+           count(HOUSE_USE = 0 or null) as sinceTheLivingNumber,
+           count(HOUSE_USE = 1 or null) as rentNumber,
+           count(HOUSE_USE = 2 or null) as businessNumber,
+           ROUND(count(HOUSE_USE = 0 or null) / count(*) * 100) as sinceTheLivingNumberPercent,
+           ROUND(count(HOUSE_USE = 1 or null) / count(*) * 100) as rentPercent,
+           ROUND(count(HOUSE_USE = 2 or null) / count(*) * 100) as businessPercent
+        from epdc_housing_information
+        where DEL_FLAG = '0';
+    </select>
+    <select id="selectListGridRanking"
+            resultType="com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO">
+        <if test="rankCategory!=null and rankCategory == 0">
+            select houseHead.houseHeadNum+resident.residentNum as total,houseHead.gridName from(
+            select count(1) as houseHeadNum,GRID_ID,gridName from(
+            select t2.GRID_ID,substring_index(t2.ALL_DEPT_NAMES,'-',-1) as gridName
+                    from epdc_population_information t
+                             left join epdc_house_resident t1 on t1.RESIDENT_ID = t.ID
+                             left join epdc_housing_information t2 on t2.ID = t1.HOUSE_ID
+                    where t.DEL_FLAG = '0'
+                      and t1.DEL_FLAG = '0' and t2.DEL_FLAG='0'
+                      and t1.IS_HOUSE_HEAD ='1'
+                        group by t2.GRID_ID,t.ID)end
+            group by end.GRID_ID)houseHead
+            left join
+            (select count(1) as residentNum,GRID_ID,gridName from(
+            select count(1),t3.GRID_ID,substring_index(t3.ALL_DEPT_NAMES,'-',-1) as gridName from epdc_population_information t
+            left join epdc_house_resident t1 on t.ID = t1.RESIDENT_ID
+            left join epdc_house_resident t2 on t1.HOUSE_HEAD_ID = t2.RESIDENT_ID
+            left join epdc_housing_information t3 on t3.Id =t2.HOUSE_ID
+            where t.DEL_FLAG ='0' and  t1.IS_HOUSE_HEAD='0' and t2.DEL_FLAG ='0' and t3.DEL_FLAG ='0'
+            group by t3.GRID_ID,t.ID)end
+            group by end.GRID_ID)resident on houseHead.GRID_ID = resident.GRID_ID
+            order by total desc
+            LIMIT #{pageIndex},#{pageSize}
+        </if>
+        <if test="rankCategory!=null and rankCategory == 1">
+            select substring_index(ALL_DEPT_NAMES,'-',-1)gridName,count(1) as total from epdc_housing_information where DEL_FLAG ='0'
+            group by GRID_ID
+            order by total desc
+            LIMIT #{pageIndex},#{pageSize}
+        </if>
+    </select>
 
 
 </mapper>