修改消防装备查询

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

@@ -534,30 +534,41 @@
         SELECT
         spec.id AS id,
         spec.org_code AS org_code,
-        spec.CODE AS CODE,
-        detail.CODE AS equip_code,
-        detail.NAME AS NAME,
+        spec.code AS code,
+        detail.code AS equip_code,
+        detail.name AS name,
         detail.standard AS model,
         detail.maintenance_cycle AS maintenance_cycle,
-        manufatcturer.NAME AS manufacturer,
+        manufatcturer.name AS manufacturer,
         detail.brand AS detail,
         detail.production_date AS production_date,
         sd.amount AS number,
-        unit.NAME AS unit,
-        '' AS position3d,
-        '' AS floor3d,
-        '' AS is_indoor,
-        '' AS room,
+        unit.name AS unit,
+        warehouse.full_name AS room,
         detail.remark,
         detail.creator_id AS create_by,
         spec.create_date AS create_date,
-        '1' equip_status,
+        (
+			CASE 
+			WHEN (
+				SELECT
+					count(1)
+				FROM
+					wl_equipment_specific_alarm a
+				WHERE
+					a.equipment_specific_id = spec.id and status = TRUE
+			)  > 0 THEN
+				0
+			ELSE
+				1
+			END
+		) AS equip_status,
         detail.video AS video_url,
         warehouse.source_id AS risk_source_id,
         warehouse.full_name AS production_area,
         (
         SELECT
-        GROUP_CONCAT( fe.NAME )
+        GROUP_CONCAT( fe.name )
         FROM
         f_equipment_fire_equipment ffe
         LEFT JOIN f_equipment fe ON fe.id = ffe.equipment_id
@@ -579,33 +590,29 @@
     </select>
     <select id="findVideoById" resultType="com.yeejoin.amos.fas.business.bo.FireEquipmentBo">
         SELECT
-        risk.*,
         video.id AS id,
         video.org_code AS org_code,
-        video.CODE AS CODE,
-        video.CODE AS equip_code,
-        video.NAME AS NAME,
+        video.`code` AS `code`,
+        video.`code` AS equip_code,
+        video.`name` AS `name`,
         '' AS model,
         '' AS maintenance_cycle,
         '' AS manufatcturer,
         '' AS detail,
         video.create_date AS production_date,
-        '' AS number,
+        1 AS number,
         '' AS unit,
-        video.position3d AS position3d,
-        risk.floor3d AS floor3d,
-        risk.is_indoor AS is_indoor,
-        '' AS room,
+        ws.full_name AS room,
         video.remark,
         video.creator_id AS create_by,
         video.create_date AS create_date,
         '1' equip_status,
         video.url AS video_url,
-        source.source_id AS risk_source_id,
-        risk.name AS production_area,
+        ws.source_id AS risk_source_id,
+        ws.full_name AS production_area,
         (
         SELECT
-        GROUP_CONCAT( fe.NAME )
+        GROUP_CONCAT( fe.`name` )
         FROM
         wl_video_important_equipment ffe
         LEFT JOIN f_equipment fe ON fe.id = ffe.important_equipment_id
@@ -614,11 +621,13 @@
         ) protectObjNames
         FROM wl_video video
         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
+        LEFT JOIN wl_warehouse_structure  ws ON ws.id = source.source_id
+       <where>
         <if test="id != null">
             video.id = #{id}
         </if>
+       </where>
+       
     </select>
     
 <!--    <select id="findFireStationById" resultType="com.yeejoin.amos.fas.dao.entity.FireStation">-->