Merge branch 'test' into 'master'

罗元桥

2021-06-30 2eea4907ca7f8e75ca234d595ee77290fb5fb2e1

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

@@ -614,7 +614,18 @@
            AND grid_id = #{gridId}
         </if>
         ) AS todaySpecialTotal,
         ( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND event_process_status = 2 ) AS specialTotal
         ( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND event_process_status = 2 ) AS specialTotal,
         (
         SELECT
            count( cmph.id )
         FROM
            com_mng_population_house AS cmph
         LEFT JOIN event_grid_data AS egd ON egd.grid_community_id = cmph.community_id
         WHERE
            <if test="gridId!=null">
               egd.id = #{gridId}
            </if>
         ) AS houseTotal
      FROM
         `event`
      WHERE