Merge branch 'test' into 'test_wangge_two'

罗元桥

2021-06-23 72f11c9e9edec3d2534112badf7a0ca48fa9da5a

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

@@ -921,16 +921,22 @@
               and e.create_at <![CDATA[<=]]> #{eventListDTO.endTime}
            </if>

            <if test='eventListDTO.gridId != null'>
               and e.grid_id = #{eventListDTO.gridId}
            <if test='eventListDTO.gridIds != null and eventListDTO.gridIds.size > 0'>
               and e.grid_id in
               <foreach collection='eventListDTO.gridIds' item='id' index='index' open='(' close=')' separator=',' >
               #{id}
               </foreach>
            </if>

            <if test='eventListDTO.eventCategory != null'>
               and e.event_category = #{eventListDTO.eventCategory}
            </if>

            <if test='eventListDTO.eventType != null'>
               and e.event_type = #{eventListDTO.eventType}
            <if test='eventListDTO.eventTypes != null and eventListDTO.eventTypes.size > 0'>
               and e.event_type in
               <foreach collection='eventListDTO.eventTypes' item='id' index='index' open='(' close=')' separator=',' >
                  #{id}
               </foreach>
            </if>

            <if test='eventListDTO.eventDealStatus != null'>