三维接口SQL修改

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -493,26 +493,26 @@
         spec.id AS id,
         spec.org_code AS org_code,
         spec.CODE AS CODE,
-        detail.code AS equip_code,
+        detail.CODE AS equip_code,
         detail.NAME AS NAME,
         detail.standard AS model,
         detail.maintenance_cycle AS maintenance_cycle,
         manufatcturer.NAME AS manufatcturer,
         detail.brand AS detail,
         detail.production_date AS production_date,
---         detail.expiry_date AS effective_date,
-        sd.amount as number,
-        unit.name as unit,
+        sd.amount AS number,
+        unit.NAME AS unit,
+        '' AS position3d,
+        '' AS floor3d,
+        '' AS is_indoor,
+        '' AS room,
         detail.remark,
         detail.creator_id AS create_by,
         spec.create_date AS create_date,
         '1' equip_status,
         detail.video AS video_url,
         warehouse.source_id AS risk_source_id,
-        '' AS position3d,
-        '' AS floor3d,
-        '' AS is_indoor,
-        '' AS room,
+        warehouse.full_name AS production_area,
         (
         SELECT
         GROUP_CONCAT( fe.NAME )
@@ -537,6 +537,7 @@
     </select>
     <select id="findVideoById" resultType="com.yeejoin.amos.fas.dao.entity.FireEquipment">
         SELECT
+        risk.*,
         video.id AS id,
         video.org_code AS org_code,
         video.CODE AS CODE,
@@ -550,8 +551,8 @@
         '' AS number,
         '' AS unit,
         video.position3d AS position3d,
-        '' AS floor3d,
-        '' AS is_indoor,
+        risk.floor3d AS floor3d,
+        risk.is_indoor AS is_indoor,
         '' AS room,
         video.remark,
         video.creator_id AS create_by,
@@ -559,6 +560,7 @@
         '1' equip_status,
         video.url AS video_url,
         source.source_id AS risk_source_id,
+        risk.name AS production_area,
         (
         SELECT
         GROUP_CONCAT( fe.NAME )
@@ -569,7 +571,8 @@
         ffe.video_id = video.id
         ) protectObjNames
         FROM wl_video video
-        LEFT JOIN wl_video_source  source ON source.id =video.id
+        LEFT JOIN wl_video_source  source ON source.video_id =video.id
+        LEFT JOIN f_risk_source risk ON risk.id = source.source_id
         WHERE
         <if test="id != null">
             video.id = #{id}