Commit 41ea5228 authored by tangwei's avatar tangwei

修改bug

parent 3eb72617
...@@ -593,48 +593,41 @@ ...@@ -593,48 +593,41 @@
<select id="getLocation" resultType="Map"> <select id="getLocation" resultType="Map">
SELECT SELECT
* *
FROM FROM
( (
( SELECT stand_code AS location, longitude, latitude FROM jc_airport_stand WHERE is_delete = 0 ORDER BY rec_date DESC) UNION ALL ( SELECT stand_code AS location, longitude, latitude FROM jc_airport_stand WHERE is_delete = 0 ORDER BY rec_date DESC ) UNION ALL
( (
SELECT SELECT
tt.location AS location, tt.location AS location,
tt.longitude AS longitude, tt.longitude AS longitude,
tt.latitude AS latitude tt.latitude AS latitude
FROM FROM
( (
SELECT SELECT
CASE MAX( CASE WHEN FIELD_CODE = 'companyLocation' THEN FIELD_VALUE END ) AS 'location',
MAX( CASE WHEN FIELD_CODE = 'longitude' THEN FIELD_VALUE END ) AS 'longitude',
WHEN MAX( CASE WHEN FIELD_CODE = 'latitude' THEN FIELD_VALUE END ) AS 'latitude'
field_code = 'companyLocation' THEN FROM
field_value cb_dynamic_form_instance
END AS location, WHERE
CASE group_code = '244'
GROUP BY
WHEN field_code = 'longitude' THEN instance_id
field_value ORDER BY
END AS longitude, rec_date DESC
CASE ) tt
WHERE
WHEN field_code = 'latitude' THEN tt.location IS NOT NULL
field_value ) UNION ALL
END AS latitude ( SELECT address AS location, coordinate_x AS longitude, coordinate_y AS latitude FROM jc_alert_called WHERE is_delete = 0 ORDER BY rec_date DESC ) UNION ALL
FROM ( SELECT address_desc AS location, longitude, latitude FROM cb_key_site WHERE is_delete = 0 )
cb_dynamic_form_instance ) hh
WHERE WHERE
group_code = '244' ORDER BY rec_date DESC hh.location IS NOT NULL
) tt AND hh.location != ''
WHERE GROUP BY
tt.location IS NOT NULL hh.hh.location
) UNION ALL
( SELECT address AS location, coordinate_x AS longitude, coordinate_y AS latitude FROM jc_alert_called WHERE is_delete = 0 ORDER BY rec_date DESC) UNION ALL
( SELECT address_desc AS location, longitude, latitude FROM cb_key_site WHERE is_delete = 0 )
) hh
WHERE
hh.location IS NOT NULL
AND hh.location != '' GROUP by hh.hh.location
</select> </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