修改实时数据查询

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

@@ -120,13 +120,6 @@
         (
         SELECT
         det.`name` as fireEquipmentName,
-        spe.`code` as fireEquipmentCode,
-        ein.name as eq_point_name,
-        CASE ind.value WHEN 'true' THEN '是'
-        WHEN 'false' THEN '否'
-        ELSE ind.value END 'e_value',
-        ein.unit as eq_point_unit,
-        sce.name as source_name,
         (
         SELECT
         group_concat(DISTINCT f.`name`)
@@ -142,12 +135,9 @@
         left join wl_equipment_specific as spe on spe.id = ind.equipment_specific_id
         left join wl_equipment_detail as det on spe.equipment_detail_id = det.id
         left join wl_equipment_index as ein on ind.equipment_index_id = ein.id
-        left join wl_stock_detail as sto on sto.qr_code = spe.qr_code
-        left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.id
-        left join f_risk_source as sce on str.source_id = sce.id
+       	WHERE ind.`value` IS NOT NULL AND ind.`value` != ''
         ) d
-        WHERE
-        1 = 1
+        <where>
 	        <if test="fireEquipmentName!=null">
 	            AND d.fireEquipmentName LIKE '%${fireEquipmentName}%'
 	        </if>
@@ -157,7 +147,7 @@
 	        <if test="startTime!=null">
 	            AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
 	        </if>
-        AND e_value IS NOT NULL AND e_value != ''
+        </where>
     </select>
 
 
@@ -192,9 +182,9 @@
         left join wl_equipment_index as ein on ind.equipment_index_id = ein.id
         left join wl_stock_detail as sto on sto.equipment_specific_id = spe.id
         left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.id
+        WHERE ind.`value` IS NOT NULL AND ind.`value` != ''
         ) d
-        WHERE
-        e_value IS NOT NULL AND e_value != ''
+      <where>
 	      <if test="fireEquipmentName!=null">
 	            AND d.fireEquipmentName LIKE '%${fireEquipmentName}%'
 	        </if>
@@ -204,6 +194,7 @@
 	        <if test="startTime!=null">
 	            AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
 	        </if>
+      </where>
         ORDER BY d.create_date desc
         LIMIT ${start},${length}
     </select>