修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -594,9 +594,9 @@
      <select id="getLocation" resultType="Map">
          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
 			tt.location AS location,
@@ -605,36 +605,29 @@
 		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
+				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' ORDER BY rec_date DESC
+				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 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
+WHERE
 	hh.location IS NOT NULL
-           AND hh.location != '' GROUP by hh.hh.location
+	AND hh.location != ''
+GROUP BY
+	hh.hh.location
 
     </select>