Commit 2d4ee0c0 authored by zhouleilei's avatar zhouleilei

bug修复

parent 8648bb1c
......@@ -43,8 +43,11 @@
a.current_algo AS event_type,
a.issue_time AS opt_start_time,
a.duration AS opt_duration,
DATE_ADD( issue_time, INTERVAL a.duration SECOND ) AS opt_end_time,
(case when current_algo=1 then concat('[',empty_dir,']') else b.dir end) dir
a.issue_time + (a.duration::integer * INTERVAL '1 SECOND') AS opt_end_time,
(CASE
WHEN a.current_algo = 1 THEN '[' || COALESCE(a.empty_dir, '') || ']'
ELSE COALESCE(b.dir, '')
END) AS dir
FROM
t_strategy_cross_result a
left join t_event_info b on a.event_id=b.event_serial_number
......
......@@ -55,9 +55,9 @@
<select id="selectLightsCodeByLaneId" resultType="java.lang.String">
select t2.lights_no
from t_base_cross_lane_lights t1
join t_base_cross_lights t2
join t_base_cross_lights t2 on t1.lights_id = t2.id
join t_base_lane_info t3
on t1.lane_id = t3.id and t1.lights_id = t2.id
on t1.lane_id = t3.id
where t3.id = #{laneId} and t3.type = 2
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment