12/23 大屏修改

101captain

2021-12-23 5a8a90c095280fbd2106869ecd2bad10e01a57a6

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

@@ -7,6 +7,8 @@
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.community.screen.civil.*;
import com.panzhihua.common.model.vos.community.bigscreen.BaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.IndexDynamic;
import com.panzhihua.service_community.model.dos.ComMngPopulationCommunityTagsDO;
@@ -27,8 +29,6 @@
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.area.AreaAddressVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.*;
import com.panzhihua.common.model.vos.community.screen.index.*;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
@@ -340,7 +340,7 @@
        + "FROM " + " event_grid_data AS egd  " + "WHERE " + " egd.grid_community_id = #{communityId}")
    List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);

    @Select("<script> " + "SELECT " + " event_type AS type, " + " e.id AS eventId, " + " happent_lat_lng AS latLng  "
    @Select("<script> " + "(SELECT " + " event_type AS type, " + " e.id AS eventId, " + " happent_lat_lng AS latLng,e.create_at as createAt  "
        + "FROM " + " `event` AS e " + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " + "WHERE "
        + " e.event_category = 1  " + " AND e.event_type IN ( 1, 2, 3, 4, 5, 6 )  " + " AND e.event_status = 2  "
        + " AND egd.grid_community_id = #{screenEventDTO.communityId}  "
@@ -352,14 +352,14 @@
        + " AND e.event_process_status = #{screenEventDTO.eventProcessStatus} " + " </if> "
        + "<if test='screenEventDTO.redCard != null'>" + " AND e.red_card = #{screenEventDTO.redCard} " + " </if> "
        + "<if test='screenEventDTO.yellowCard != null'>" + " AND e.yellow_card = #{screenEventDTO.yellowCard} "
        + " </if> " + "UNION ALL SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng  "
        + " </if> )" + "UNION ALL (SELECT " + " IFNULL( NULL, 7 ) AS type, " + " id AS eventId, " + " lng_lat AS latLng,create_at as createAt  "
        + "FROM " + " com_act_easy_photo  " + "WHERE " + " community_id = #{screenEventDTO.communityId}  "
        + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>"
        + " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
        + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>"
        + " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> "
        + "<if test='screenEventDTO.eventProcessStatus != null'>"
        + " AND handle_status = #{screenEventDTO.eventProcessStatus} " + " </if> " + " </script>")
        + " AND handle_status = #{screenEventDTO.eventProcessStatus} " + " </if> )" + "order by createAt desc </script>")
    List<EventGridIncidentStatisticsVO>
        getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);

@@ -370,7 +370,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);

@@ -620,6 +620,38 @@
    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);

    CivilGridStatisticsVO getCivilGrid(@Param("communityId") Long communityId);

    CivilConvenienceStatisticsVO getCivilConvenience(@Param("communityId") Long communityId);

    /**
     * 西区治理数据统计
     * @return
     */
    WestScreenStatics westScreenStatics();

    List<EventPopulationBasicsStatisticsVO> getBasicsList(@Param("streetId") Long streetId);

    EventPopulationSpecialStatisticsVO getPopulationSpecial(@Param("streetId") Long streetId);

    List<String> getPopulationListCardNo(@Param("streetId") Long streetId);

    Integer getPopulationAge(@Param("streetId") Long streetId, @Param("age") Integer age);

    List<EventPopulationStreetVO> getComprehensiveStreetList();

    /**
     * 基础数据统计
     * @param communityId
     * @return