修改bug

huanghongfa

2021-09-26 6f05a3669979af08422a2f6fd6df93e3e39774d7

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

@@ -156,9 +156,9 @@
    IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);

    @Select("<script> "
        + "select id,tag_name,community_id,create_at,sys_flag from com_mng_user_tag where community_id = #{comMngUserTagDTO.communityId}"
        + "select id,tag_name,community_id,create_at,sys_flag from com_mng_user_tag <where> "
        + "<if test='comMngUserTagDTO.tagName != null and comMngUserTagDTO.tagName != &quot;&quot;'>"
        + " AND tag_name LIKE concat(#{comMngUserTagDTO.tagName},'%') " + " </if> " + " order by create_at desc "
        + " AND tag_name LIKE concat(#{comMngUserTagDTO.tagName},'%') " + " </if> " + "</where>" + " order by create_at desc "
        + "</script>")
    IPage<ComMngTagVO> specialInputUserTags(Page page, @Param("comMngUserTagDTO") PageInputUserDTO comMngUserTagDTO);

@@ -182,7 +182,7 @@
    @Select("select count(id) as populationTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 1) as localTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 2) as outTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmpct.label is not null) as specialTotal "
        + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and IFNULL(cmpct.label,'') != '') as specialTotal "
        + ",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal "
        + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal "
@@ -548,15 +548,6 @@
    @Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
    Integer getStatisticsCount(@Param("communityId") Long communityId);

    @Select("<script> "
        + "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmpct.label,cmp.address,cmp.nation,cmp.political_outlook,cmv.lng,cmv.lat"
        + ",cmp.sex from com_mng_population as cmp left join com_mng_village as cmv on cmv.village_id = cmp.village_id "
        + " left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  "
        + " where cmpct.community_id = #{populationListDTO.communityId}"
        + "<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != &quot;&quot;'>"
        + "AND (cmp.`name` like concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%'))  "
        + " </if> " + "<if test='populationListDTO.label != null and populationListDTO.label != &quot;&quot;'>"
        + "AND cmpct.label like concat ('%',#{populationListDTO.label},'%') " + " </if> " + " </script>")
    IPage<PopulationListVO> pagePopulationListApp(Page page,
        @Param("populationListDTO") PagePopulationListDTO populationListDTO);

@@ -567,10 +558,10 @@
        + " cmp.census_register, " + " cmp.out_or_local, " + " cmp.remark, " + " cmp.marriage " + "FROM "
        + " com_mng_population AS cmp " + " LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id  "
        + " left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id  " + "WHERE "
        + " id = #{populationId}")
        + " cmp.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 +580,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 +606,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( cmp.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,14 +637,12 @@
        + "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);

    @Select("<script> "
        + " select cmp.id,cmp.`name`,cmp.card_no,cmtct.label from com_mng_population as cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id where 1=1 "
        + " select cmp.id,cmp.`name`,cmp.card_no,cmpct.label from com_mng_population as cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id where 1=1 "
        + "<if test='villagePopulationDTO.villageId != null'>"
        + " and cmp.village_id = #{villagePopulationDTO.villageId} " + " </if> "
        + "<if test='villagePopulationDTO.keyWord != null'>"