Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-09 9576bebcacea938771f6f5b51d958e6a4ac59df6

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

@@ -366,7 +366,7 @@
    CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId,
        @Param("lastMonth") Date lastMonth);

    @Select("SELECT `NAME`, " + " user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id  " + "FROM "
    @Select("SELECT `NAME`, " + "user_sum, " + " lng, " + " lat, " + " village_images, " + " village_id  " + "FROM "
        + " com_mng_village AS cmv  " + "WHERE " + " community_id = #{communityId}")
    List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);

@@ -615,6 +615,14 @@
     */
    void updatePopulationUnit(@Param("villageId") Long villageId, @Param("floor") String floor,@Param("oldUnitNo") String oldUnitNo,@Param("newUnitNo") String newUnitNo);

    /**
     * 根据villageId查询特殊人群数
     * @param villageId
     * @param label
     * @return
     */
    Integer selectCountByVillageId(@Param("villageId") Long villageId,@Param("label")String label);

    CivilPartyStatisticsVO getCivilParty(@Param("communityId") Long communityId);

    CivilGovernmentStatisticsVO getCivilGovernment(@Param("communityId") Long communityId);