Skip to content

Y
YeeAmosFireAutoSysRoot
Commit ae7f3131 authored by 高建强's avatar 高建强
Browse files
Options

item:修改三维重点设备查询bug

parent 4a351874
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 0 deletions
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml
View file @ ae7f3131
......@@ -1990,6 +1990,31 @@
</if>
</where>
UNION ALL
SELECT
concat( 'impEquipment-', e.id ) AS id,
concat( e.id ) AS originId,
e.NAME,
e.CODE,
'impEquipment' AS type,
e.org_code AS orgCode,
0 AS LEVEL,
'level_0' AS levelStr,
e.is_indoor AS isIndoor,
'重点设备' AS typeName,
'impEquipment' AS typeCode,
e.NAME AS label,
e.NAME AS protectObjName,
'' AS routeName,
NULL AS areaId,
'' AS person,
e.NAME AS title,
concat( 'impEquipment-', e.id ) AS `key`,
e.risk_source_id AS riskSourceId,
r.NAME AS room
FROM
f_equipment e
LEFT JOIN f_risk_source r ON r.id = e.risk_source_id
UNION ALL
SELECT
concat('fireEquipment-', m.id) AS id,
concat(m.id) AS originId,
......@@ -2173,6 +2198,31 @@
AND p.area_id = #{areaId}
</if>
</where>
UNION all
SELECT
concat( 'impEquipment-', e.id ) AS id,
concat( e.id ) AS originId,
e.NAME,
e.CODE,
'impEquipment' AS type,
e.org_code AS orgCode,
0 AS LEVEL,
'level_0' AS levelStr,
e.is_indoor AS isIndoor,
'重点设备' AS typeName,
'impEquipment' AS typeCode,
e.NAME AS label,
e.NAME AS protectObjName,
'' AS routeName,
NULL AS areaId,
'' AS person,
e.NAME AS title,
concat( 'impEquipment-', e.id ) AS `key`,
e.risk_source_id AS riskSourceId,
r.NAME AS room
FROM
f_equipment e
LEFT JOIN f_risk_source r ON r.id = e.risk_source_id
UNION ALL
SELECT
concat('fireEquipment-', m.id) AS id,
......
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