|
@@ -411,17 +411,16 @@
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="listAll" parameterType="VisuForestCloudMapVO" resultType="VisuForestCloudMapEventListBO">
|
|
<select id="listAll" parameterType="VisuForestCloudMapVO" resultType="VisuForestCloudMapEventListBO">
|
|
- select a.id eventId, event_code eventCode, event_name eventName, version, address, b.camera_code cameraCode
|
|
|
|
- from centerevent_t_eventcatalogue a
|
|
|
|
- left join onest_monitor.centermonitor_t_camera b on a.create_by = b.id
|
|
|
|
|
|
+ select id eventId, event_code eventCode, event_name eventName, version, address, create_by cameraCode
|
|
|
|
+ from centerevent_t_eventcatalogue
|
|
where event_status_value = 'forest_event_status_1' and report_source = 'reporting_source_1'
|
|
where event_status_value = 'forest_event_status_1' and report_source = 'reporting_source_1'
|
|
<if test="eventName != null and eventName != ''">
|
|
<if test="eventName != null and eventName != ''">
|
|
and event_name like concat('%', #{eventName},'%')
|
|
and event_name like concat('%', #{eventName},'%')
|
|
</if>
|
|
</if>
|
|
<if test="day != null and day != ''">
|
|
<if test="day != null and day != ''">
|
|
- and DATE_FORMAT(a.create_time,'%Y-%m-%d') = #{day}
|
|
|
|
|
|
+ and DATE_FORMAT(create_time,'%Y-%m-%d') = #{day}
|
|
</if>
|
|
</if>
|
|
- order by a.create_time desc
|
|
|
|
|
|
+ order by create_time desc
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getEventFileAll" resultType="VisuForestCloudMapEventListBO">
|
|
<select id="getEventFileAll" resultType="VisuForestCloudMapEventListBO">
|