修改bug

huanghongfa

2021-07-12 2930d753db74f60d2496fab90817f5b96db5a417

修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDTO.java

New file
@@ -0,0 +1,20 @@
package com.panzhihua.common.model.dtos.community.bigscreen;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("事件大屏请求参数")
public class BigScreenEventDTO {

    @ApiModelProperty(value = "社区id", required = true)
    private Long communityId;

    @ApiModelProperty(value = "查询开始时间")
    private String startTime;

    @ApiModelProperty(value = "查询结束时间")
    private String endTime;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -5,10 +5,7 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
import com.panzhihua.common.model.dtos.community.bigscreen.*;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
@@ -3133,11 +3130,11 @@
    /**
     * 事件大屏统计接口
     *
     * @param communityId 社区id
     * @param screenEventDTO 请求参数
     * @return 统计结果
     */
    @GetMapping("/screen/getScreenEvent")
    R getScreenEvent(@RequestParam("communityId") Long communityId);
    @PostMapping("/screen/getScreenEvent")
    R getScreenEvent(@RequestBody BigScreenEventDTO screenEventDTO);

    /**
     * 民生大屏统计接口

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java

@@ -1,5 +1,6 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.vos.R;
@@ -45,12 +46,12 @@
    }

    @ApiOperation(value = "事件大屏统计接口@lyq",response = EventStatisticsVO.class)
    @GetMapping("/event/noToken")
    public R event(@RequestParam("communityId") Long communityId) {
        if(communityId == null){
    @PostMapping("/event/noToken")
    public R event(@RequestBody BigScreenEventDTO screenEventDTO) {
        if(screenEventDTO.getCommunityId() == null){
            return R.fail("参数错误");
        }
        return communityService.getScreenEvent(communityId);
        return communityService.getScreenEvent(screenEventDTO);
    }

    @ApiOperation(value = "事件大屏详情接口@lyq",response = EventNewStatisticsVO.class)

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngPopulationService;
@@ -28,12 +29,12 @@

    /**
     * 事件大屏统计接口
     * @param communityId   社区id
     * @param screenEventDTO   请求参数
     * @return  统计结果
     */
    @GetMapping("/getScreenEvent")
    public R event(@RequestParam("communityId") Long communityId) {
        return R.ok(comMngPopulationService.getScreenEvent(communityId));
    @PostMapping("/getScreenEvent")
    public R event(@RequestBody BigScreenEventDTO screenEventDTO) {
        return R.ok(comMngPopulationService.getScreenEvent(screenEventDTO));
    }

    /**

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
@@ -434,7 +435,8 @@
            " label like concat('%',#{label},'%')")
    Integer getSpecialStatisticsByLabel(@Param("label") String label);

    @Select("SELECT " +
    @Select("<script> " +
            "SELECT " +
            " count( egd.id ) AS gridTotal, " +
            " ( SELECT count( user_id ) FROM sys_user WHERE community_id = egd.grid_community_id AND type = 6 ) AS gridMemberTotal, " +
            " ( " +
@@ -446,6 +448,12 @@
            " WHERE " +
            "  egd1.grid_community_id = egd.grid_community_id  " +
            "  AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " ) AS eventTotal, " +
            " ( " +
            " SELECT " +
@@ -456,6 +464,12 @@
            " WHERE " +
            "  egd2.grid_community_id = egd.grid_community_id  " +
            "  AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " AND event_deal_status IN ( 1, 2, 3 )) AS noSolveEventTotal, " +
            " ( " +
            " SELECT " +
@@ -467,12 +481,19 @@
            "  egd2.grid_community_id = egd.grid_community_id  " +
            "  AND event_status = 2  " +
            "  AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " ) AS solveEventTotal  " +
            "FROM " +
            " event_grid_data AS egd  " +
            "WHERE " +
            " egd.grid_community_id = #{communityId}")
    EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("communityId") Long communityId);
            " egd.grid_community_id = #{screenEventDTO.communityId} " +
            " </script>")
    EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);

    @Select("SELECT " +
            " DATE_FORMAT( e.create_at, '%m' ) months  " +
@@ -490,7 +511,8 @@
            " LIMIT 3")
    List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);

    @Select("SELECT " +
    @Select("<script> " +
            "SELECT " +
            " count( e.id ) AS eventZATotal, " +
            " IFNULL(( " +
            "  SELECT " +
@@ -499,10 +521,16 @@
            "   `event` AS e1 " +
            "   LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id  " +
            "  WHERE " +
            "   egd1.grid_community_id = #{communityId}  " +
            "   egd1.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 1  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventZATotal, " +
@@ -513,10 +541,16 @@
            "   `event` AS e2 " +
            "   LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id  " +
            "  WHERE " +
            "   egd2.grid_community_id = #{communityId}  " +
            "   egd2.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 5  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e2.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e2.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventTFTotal, " +
@@ -527,10 +561,16 @@
            "   `event` AS e3 " +
            "   LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id  " +
            "  WHERE " +
            "   egd3.grid_community_id = #{communityId}  " +
            "   egd3.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 5  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e3.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e3.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventTFTotal, " +
@@ -541,10 +581,16 @@
            "   `event` AS e4 " +
            "   LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id  " +
            "  WHERE " +
            "   egd4.grid_community_id = #{communityId}  " +
            "   egd4.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 6  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e4.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e4.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventTSTotal, " +
@@ -555,10 +601,16 @@
            "   `event` AS e5 " +
            "   LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id  " +
            "  WHERE " +
            "   egd5.grid_community_id = #{communityId}  " +
            "   egd5.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 6  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e5.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e5.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventTSTotal, " +
@@ -569,10 +621,16 @@
            "   `event` AS e6 " +
            "   LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id  " +
            "  WHERE " +
            "   egd6.grid_community_id = #{communityId}  " +
            "   egd6.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 3  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e6.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e6.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventMDTotal, " +
@@ -583,10 +641,16 @@
            "   `event` AS e7 " +
            "   LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id  " +
            "  WHERE " +
            "   egd7.grid_community_id = #{communityId}  " +
            "   egd7.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 3  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e7.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e7.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventMDTotal, " +
@@ -597,10 +661,16 @@
            "   `event` AS e8 " +
            "   LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id  " +
            "  WHERE " +
            "   egd8.grid_community_id = #{communityId}  " +
            "   egd8.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 4  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e8.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e8.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventBWDTotal, " +
@@ -611,10 +681,16 @@
            "   `event` AS e9 " +
            "   LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id  " +
            "  WHERE " +
            "   egd9.grid_community_id = #{communityId}  " +
            "   egd9.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 4  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e9.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e9.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventBWDTotal, " +
@@ -625,10 +701,16 @@
            "   `event` AS e10 " +
            "   LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id  " +
            "  WHERE " +
            "   egd10.grid_community_id = #{communityId}  " +
            "   egd10.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 2  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e10.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e10.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventGGTotal, " +
@@ -639,24 +721,51 @@
            "   `event` AS e11 " +
            "   LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id  " +
            "  WHERE " +
            "   egd11.grid_community_id = #{communityId}  " +
            "   egd11.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 2  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e11.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e11.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventGGTotal, " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND community_id = #{communityId} ), 0 ) AS eventSSPTotal, " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND community_id = #{communityId} ), 0 ) AS yesEventSSPTotal  " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND 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> " +
            "), 0 ) AS eventSSPTotal, " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND 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> " +
            "), 0 ) AS yesEventSSPTotal  " +
            "FROM " +
            " `event` AS e " +
            " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " +
            "WHERE " +
            " egd.grid_community_id = #{communityId}  " +
            " egd.grid_community_id = #{screenEventDTO.communityId}  " +
            " AND event_category = 1  " +
            " AND event_type = 1  " +
            " AND event_status = 2")
    EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("communityId") Long communityId);
            " AND event_status = 2 " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " </script>")
    EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);

    @Select("SELECT " +
            " su.nick_name AS userName, " +
@@ -698,7 +807,8 @@
            " egd.grid_community_id = #{communityId}")
    List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);

    @Select("SELECT " +
    @Select("<script> " +
            "SELECT " +
            " event_type AS type, " +
            " e.id AS eventId, " +
            " happent_lat_lng AS latLng  " +
@@ -709,20 +819,31 @@
            " 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 = #{communityId}  " +
            " AND e.create_at >= DATE_SUB(CURDATE(),INTERVAL 30 DAY) UNION ALL " +
            "SELECT " +
            " AND egd.grid_community_id = #{screenEventDTO.communityId}  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "UNION ALL SELECT " +
            " IFNULL( NULL, 7 ) AS type, " +
            " id AS eventId, " +
            " lng_lat AS latLng  " +
            "FROM " +
            " com_act_easy_photo  " +
            "WHERE " +
            " community_id = #{communityId}  " +
            " community_id = #{screenEventDTO.communityId}  " +
            " AND del_tag = 0  " +
            " AND lng_lat IS NOT NULL  " +
            " AND create_at >= DATE_SUB(CURDATE(),INTERVAL 30 DAY)")
    List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("communityId") Long 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> " +
            " </script>")
    List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);

    @Select("SELECT " +
            " count( id ) AS specialTotal, " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
@@ -172,10 +173,10 @@

    /**
     * 事件大屏统计接口
     * @param communityId   社区id
     * @param screenEventDTO   请求参数
     * @return  统计结果
     */
    R getScreenEvent(Long communityId);
    R getScreenEvent(BigScreenEventDTO screenEventDTO);

    /**
     * 民生大屏统计接口

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java

@@ -504,6 +504,7 @@
            comActDiscussVO.setUserName(loginUserInfoVO.getName());
            comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
            comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());
            comActDiscussVO.setUserType(loginUserInfoVO.getType());
        }
        Long communityId = comActDiscussDO.getCommunityId();
        Integer type1 = loginUserInfoVO.getType();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -13,6 +13,7 @@
import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
@@ -1018,24 +1019,26 @@
    /**
     * 事件大屏统计接口
     *
     * @param communityId 社区id
     * @param screenEventDTO 请求参数
     * @return 统计结果
     */
    @Override
    public R getScreenEvent(Long communityId) {
    public R getScreenEvent(BigScreenEventDTO screenEventDTO) {

        Long communityId = screenEventDTO.getCommunityId();
        //创建统计返回参数
        EventStatisticsVO statisticsVO = new EventStatisticsVO();

        //查询页面左边数据
        EventLeftStatisticsVO leftStatisticsVO = new EventLeftStatisticsVO();
        //查询左上数据
        EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(communityId);
        EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(screenEventDTO);
        //查询时间频发月份
        List<Integer> monthList = this.baseMapper.getFrequentlyEventMonth(communityId);
        leftTopStatisticsVO.setOftenMonth(monthList);
        leftStatisticsVO.setLeftTopStatisticsVO(leftTopStatisticsVO);
        //查询左下数据
        EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(communityId);
        EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(screenEventDTO);
        leftStatisticsVO.setLeftDownStatisticsVO(leftDownStatisticsVO);
        statisticsVO.setLeftStatisticsVO(leftStatisticsVO);

@@ -1085,7 +1088,7 @@
        statisticsVO.setGridStatisticsList(gridStatisticsList);

        //查询社区事件列表
        List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(communityId);
        List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(screenEventDTO);
        statisticsVO.setGridIncidentList(gridIncidentList);

        //查询小区列表