Merge branch 'test_screen' into 'master'

罗元桥

2021-06-21 3f78e5a92b54cfa64425e73611ae0ac7ba81bc52

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

@@ -809,15 +809,18 @@
    @Select("SELECT " +
            " su.nick_name AS userName, " +
            " su.image_url AS imageUrl, " +
            " e.happen_time as createAt, " +
            " e.create_at as createAt, " +
            " e.event_des, " +
            " e.event_clazz, " +
            " e.danger_level, " +
            " e.urgent, " +
            " e.major, " +
            " e.happen_address, " +
            " e.happent_lat_lng, " +
            " e.event_type, " +
            " e.event_category, " +
            " e.id, " +
            " egd.grid_name, " +
            " e.event_deal_status  " +
            "FROM " +
            " `event` AS e " +
@@ -827,4 +830,10 @@
            " e.id = #{eventId}")
    EventNewStatisticsVO getEventScreenEventDetail(@Param("eventId") Long eventId);

    @Select("select process_date,process_result from event_transfer_record where event_id = #{eventId}")
    List<EventTransferRecordVO> getEventScreenEventTransList(@Param("eventId") Long eventId);

    @Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
    Integer getStatisticsCount(@Param("communityId") Long communityId);

}