Merge remote-tracking branch 'origin/test' into test

xyh

2021-06-30 c195b4ebc79b60539083f7089a5f878c1604fce9

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

@@ -538,8 +538,7 @@
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
         WHERE
            egd.grid_community_id = #{communityId}
            AND e.event_status = 2
            e.event_status = 2
            AND e.event_process_status = 2
         ) AS handleEventTotal,
         (
@@ -549,17 +548,15 @@
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
         WHERE
            egd.grid_community_id = #{communityId}
            AND e.event_category = 2
            e.event_category = 2
            AND e.event_status = 2
         ) AS propagandaEducationTotal,
         ( SELECT count( id ) FROM com_act_easy_photo WHERE handle_status = 2 AND community_id = #{communityId} ) AS easyPhotoTotal
         ( SELECT count( id ) FROM com_act_easy_photo WHERE handle_status = 2  ) AS easyPhotoTotal
      FROM
         `event` AS e
         LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
      WHERE
         egd.grid_community_id = #{communityId}
         AND e.event_status = 2
         e.event_status = 2
   </select>

   <select id="getEventCountByGridIds" resultType="Integer">