Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b

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

@@ -34,9 +34,9 @@
        + " from com_mng_population_house where village_id = #{villageId}")
    ComMngVillageVO getStatisticsCount(@Param("villageId") Long villageId);

    @Select("select count(village_id) as villageTotal"
        + ",(select count(village_id) from com_mng_village where community_id = ${communityId} and type = 1) as townTotal"
        + ",(select count(village_id) from com_mng_village where community_id = ${communityId} and type = 2) as countrysideTotal"
    @Select("select count(distinct `name`) as villageTotal"
        + ",(select count(distinct `name`) from com_mng_village where community_id = ${communityId} and type = 1) as townTotal"
        + ",(select count(distinct `name`) from com_mng_village where community_id = ${communityId} and type = 2) as countrysideTotal"
        + " from com_mng_village where community_id = ${communityId}")
    ComMngVillageTotalVO getVillageStatisticsCount(@Param("communityId") Long communityId);