Merge branch 'test_future_wangge' into 'test'

罗元桥

2021-06-08 03691625bababea11470c72078ee71eb36dcfe07

Merge branch 'test_future_wangge' into 'test'

Test future wangge

See merge request root/zhihuishequ!35

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

@@ -853,13 +853,13 @@
            AND e.event_type = 5
            AND e.event_process_status = 2
            <if test="statisticsDTO.gridId!=null">
                AND grid_id = #{statisticsDTO.gridId}
                AND e.grid_id = #{statisticsDTO.gridId}
            </if>
            <if test='statisticsDTO.startTime != null and statisticsDTO.startTime != &quot;&quot;'>
                AND create_at <![CDATA[ >= ]]> #{statisticsDTO.startTime}
                AND e.create_at <![CDATA[ >= ]]> #{statisticsDTO.startTime}
            </if>
            <if test='statisticsDTO.endTime != null and statisticsDTO.endTime != &quot;&quot;'>
                AND create_at <![CDATA[ <= ]]> #{statisticsDTO.endTime}
                AND e.create_at <![CDATA[ <= ]]> #{statisticsDTO.endTime}
            </if>
    </select>