bug修改

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -754,7 +754,8 @@
                         EQUIPMENT_NAME AS equipmentName,
                         SUB_SYSTEM     AS subSystem,
                         POINT_NAME     AS pointName,
-                        INDEX_ADDRESS  AS indexAddress
+                        INDEX_ADDRESS  AS indexAddress,
+                     KKS
                  FROM idx_biz_fan_point_process_variable_classification
                  WHERE TAG_CODE = '分析变量'
                    AND ARAE is not null
@@ -763,14 +764,15 @@
                    AND SUB_SYSTEM is not null
                    AND POINT_NAME is not null
                    AND INDEX_ADDRESS is not null
-                     order by KKS ASC)
+                     )
                  UNION ALL
                  (SELECT ARAE           AS area,
                         STATION        AS station,
                         SUBARRAY       AS equipmentName,
                         EQUIPMENT_NAME AS subSystem,
                         POINT_NAME     AS pointName,
-                        INDEX_ADDRESS  AS indexAddress
+                        INDEX_ADDRESS  AS indexAddress,
+                     KKS
                  FROM idx_biz_pv_point_process_variable_classification
                  WHERE TAG_CODE = '分析变量'
                    AND ARAE is not null
@@ -779,8 +781,9 @@
                    AND EQUIPMENT_NAME is not null
                    AND POINT_NAME is not null
                    AND INDEX_ADDRESS is not null
-                     order by KKS ASC)
+                )
              ) a
+        ORDER BY a.station ASC, a.equipmentName ASC, a.equipmentName asc, a.subSystem asc
     </select>
 
     <select id="getStationIndexInfo" resultType="java.util.Map">