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

tangxiaobao

2021-07-16 503135f1f8a7cfed29cac1786a6a7c8758eed8d3

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

@@ -72,7 +72,7 @@
         <if test="pageEventDTO.eventDealStatus!=null">
             AND event_deal_status = #{pageEventDTO.eventDealStatus}
         </if>
         <if test="pageEventDTO.isAll!=null and pageEventDTO.isAll = 1">
         <if test="pageEventDTO.isAll!=null and pageEventDTO.isAll == 1">
            AND event_deal_status in (1,2,4)
         </if>
         <if test="pageEventDTO.revokeType!=null">
@@ -1027,7 +1027,8 @@
            LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id
         WHERE
            e3.event_status = 2
            AND e3.create_at LIKE CONCAT(#{nowDate},'%')) as currentNum
            AND e3.create_at LIKE CONCAT(#{nowDate},'%')) as currentNum,
            (select count(id) from com_act_easy_photo where community_id = 2 and del_tag = 0 and create_at LIKE CONCAT('2021-07','%')) as sspCurrentNum

            FROM
               `event` AS e
@@ -1090,7 +1091,7 @@
      WHERE
         egd.grid_community_id = #{communityId}
         AND e.event_status = 2
         AND e.event_deal_status in (1,2,3,4,6)
         AND e.event_deal_status in (1,2,3,4,6,8)
      ORDER BY
         e.create_at DESC
         LIMIT 10