Commit 41ea5228 authored by tangwei's avatar tangwei

修改bug

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