修改bug

huanghongfa

2021-08-26 b7694af918a917ad16a07f8cbf3ed48c462d8b0d

修改bug

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -570,7 +570,7 @@
        + " id = #{populationId}")
    PopulationDetailVO getPopulationDetailApp(@Param("populationId") Long populationId);

    @Select("<script> " + "SELECT " + " *  " + "FROM " + " ( " + " SELECT " + " cmp.id, " + "  cmp.`name` AS userName, "
    @Select("<script> " + " SELECT " + " cmp.id, " + "  cmp.`name` AS userName, "
        + "  cmpct.label, " + "  cmp.card_no, " + "  cmp.card_no_str, " + "  cmp.sex, " + "  cmp.address, "
        + "  cmp.political_outlook, " + "  cmp.census_register, " + "  cmp.house_id, " + "  cmp.phone, "
        + "  IFNULL(cmp.house_id,0) as isHouse, "
@@ -589,9 +589,7 @@
        + "AND cmp.house_id is null " + " </if> " + "<if test='populationListDTO.communityId != null'>"
        + "AND cmpct.community_id = #{populationListDTO.communityId} " + " </if> "
        + "<if test='populationListDTO.politicalOutlook != null'>"
        + "AND cmp.political_outlook = #{populationListDTO.politicalOutlook} " + " </if> "
        + " ) as population where 1=1 " + "<if test='populationListDTO.eventStatus != null'>"
        + "AND population.eventStatus = #{populationListDTO.eventStatus} " + " </if> " + " </script>")
        + "AND cmp.political_outlook = #{populationListDTO.politicalOutlook} " + " </if> " + " </script>")
    IPage<ComMngPopulationListVO> getGridPopulationAdminList(Page page,
        @Param("populationListDTO") ComMngPopulationListDTO populationListDTO);

@@ -617,18 +615,15 @@
        @Param("populationDTO") PageComMngPopulationDTO populationDTO);

    @Select("<script> " + "SELECT " + " count( id ) AS localNum, "
        + " ( SELECT count( cmpct.id ) FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmp.id = cmpct.population_id WHERE cmp.out_or_local = 2 "
        + "<if test='communityId != null and communityId != 0'>" + " AND cmpct.community_id = #{communityId} "
        + " </if> " + " ) AS flowNum, "
        + " ( SELECT count( cmpct.id ) FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmp.id = cmpct.population_id WHERE cmpct.label IS NOT NULL "
        + "<if test='communityId != null and communityId != 0'>" + " AND cmpct.community_id = #{communityId} "
        + " </if> " + " ) AS specialNum  " + "FROM "
        + " com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmp.id = cmpct.population_id  "
        + "WHERE " + " cmp.out_or_local = 1 " + "<if test='communityId != null and communityId != 0'>"
        + " AND cmpct.community_id = #{communityId} " + " </if> " + " </script>")
        + " ( SELECT count( cmpct.id ) FROM com_mng_population as cmp WHERE cmp.out_or_local = 2 "
        +  " ) AS flowNum, "
        + " ( SELECT count( cmpct.id ) FROM com_mng_population as cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id WHERE cmpct.label IS NOT NULL "
        + " ) AS specialNum  " + "FROM "
        + " com_mng_population as cmp  "
        + "WHERE " + " cmp.out_or_local = 1 " + " </script>")
    PopulationStatisticsVO getGridPopulationStatistics(@Param("communityId") Long communityId);

    @Select("<script> " + "SELECT " + " *  " + "FROM " + " ( " + " SELECT " + " cmp.id, " + "  cmp.`name` AS userName, "
    @Select("<script> " + " SELECT " + " cmp.id, " + "  cmp.`name` AS userName, "
        + "  cmpct.label, " + "  cmp.card_no, " + "  cmp.card_no_str, " + "  cmp.sex, " + "  cmp.address, "
        + "  cmp.political_outlook, " + "  cmp.census_register, " + "  cmp.house_id, " + "  cmp.phone, "
        + "  IFNULL(cmp.house_id,0) as isHouse, "
@@ -651,9 +646,7 @@
        + "AND cmp.house_id is null " + " </if> " + "<if test='populationExportDTO.communityId != null'>"
        + "AND cmpct.community_id = #{populationExportDTO.communityId} " + " </if> "
        + "<if test='populationExportDTO.politicalOutlook != null'>"
        + "AND cmp.political_outlook = #{populationExportDTO.politicalOutlook} " + " </if> "
        + " ) as population where 1=1 " + "<if test='populationExportDTO.eventStatus != null'>"
        + "AND population.eventStatus = #{populationExportDTO.eventStatus} " + " </if> " + " </script>")
        + "AND cmp.political_outlook = #{populationExportDTO.politicalOutlook} " + " </if> " + " </script>")
    List<ComMngPopulationListVO>
        getGridPopulationAdminLists(@Param("populationExportDTO") ComMngPopulationExportDTO populationExportDTO);