Merge branch 'test_esay_photo' into 'test'

罗元桥

2021-06-24 0b43900a6ff31977553b4321bbbb5927f31a9319

Merge branch 'test_esay_photo' into 'test'

统计增加随手拍

See merge request root/zhihuishequ!82

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventTypeWorkVO.java

@@ -32,4 +32,7 @@
    @ApiModelProperty("特殊人群上报")
    private Integer tsTotal;

    @ApiModelProperty("随手拍")
    private Integer sspTotal;

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -1170,7 +1170,8 @@
                AND e5.event_process_status = 2
                AND e5.event_type = 6
                AND egd5.grid_community_id = #{communityId}
            ) AS tsTotal
            ) AS tsTotal,
            (select count(id) from com_act_easy_photo as caep where community_id = #{communityId} and handle_status = 2) as sspTotal
        FROM
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
@@ -1243,7 +1244,8 @@
                AND e5.event_status = 2
                AND e5.event_type = 6
                AND egd5.grid_community_id = #{communityId}
            ) AS tsTotal
            ) AS tsTotal,
            (select count(id) from com_act_easy_photo as caep where community_id = #{communityId} and handle_status = 1) as sspTotal
        FROM
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id