Merge branch 'test' into 'test_bak'

罗元桥

2021-10-12 ac40c3007b59a73c6ad985d8fab2a6d0db65af87

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

@@ -28,7 +28,8 @@

    @Select("select count(id) as houseTotal"
        + ",(select count(DISTINCT floor) from com_mng_population_house where village_id = #{villageId}) as floorTotal"
        + ",(select count(id) from com_mng_population where village_id = #{villageId}) as populationTotal"
        + ",(select count(id) from com_mng_population  where road = (select alley from com_mng_village where village_id = #{villageId})"
        + " and door_no = (select house_num from com_mng_village where village_id = #{villageId})) as populationTotal"
        + ",(select count(id) from com_mng_car where area_id = #{villageId}) as carTotal"
        + " from com_mng_population_house where village_id = #{villageId}")
    ComMngVillageVO getStatisticsCount(@Param("villageId") Long villageId);