Skip to content

Y
YeeAmosFireAutoSysRoot
Commit cfb9bfd3 authored by KeYong's avatar KeYong
Browse files
Options

修改物联日志bug

parent 030739f6
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 39 deletions
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml
View file @ cfb9bfd3
...@@ -702,63 +702,73 @@ ...@@ -702,63 +702,73 @@
</select> --> </select> -->
<select id="queryForZXJFireEquipmentHistoryCount" resultType="long"> <select id="queryForZXJFireEquipmentHistoryCount" resultType="long">
SELECT SELECT
COUNT(1) COUNT(1)
FROM FROM
( (
SELECT SELECT
det.`name` as fireEquipmentName, spe.biz_org_name AS bizOrgName,
spe.`code` as fireEquipmentCode, det.`name` as fireEquipmentName,
ind.update_date spe.`code` as fireEquipmentCode,
FROM ein.name as eq_point_name,
wl_equipment_specific_index as ind CASE ind.value WHEN 'true' THEN '是'
left join wl_equipment_specific as spe on spe.id = ind.equipment_specific_id WHEN 'false' THEN '否'
left join wl_equipment_detail as det on spe.equipment_detail_id = det.id ELSE FORMAT(IFNULL(ind.value, 0), 2) END 'e_value',
WHERE ind.`value` IS NOT NULL AND ind.`value` != '' ein.unit as eq_point_unit,
CONCAT(IFNULL(str.full_name,''),' ',IFNULL(sto.description,'')) as source_name,
ind.update_date as create_date
FROM
wl_equipment_specific_index as ind
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.equipment_specific_id = spe.id
left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id
WHERE det.`name` IS NOT NULL AND ind.`value` IS NOT NULL AND ind.`value` != '' AND ein.is_iot = 1
) d ) d
<where> <where>
<if test="fireEquipmentName!=null"> <if test="fireEquipmentName!=null">
AND d.fireEquipmentName LIKE '%${fireEquipmentName}%' AND d.fireEquipmentName LIKE '%${fireEquipmentName}%'
</if> </if>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
AND d.update_date &gt;= #{startTime} AND d.create_date &gt;= #{startTime}
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
AND d.update_date &lt;= #{endTime} AND d.create_date &lt;= #{endTime}
</if> </if>
</where> </where>
</select> </select>
<select id="queryForZXJFireEquipmentHistory" resultType="map"> <select id="queryForZXJFireEquipmentHistory" resultType="map">
SELECT SELECT
d.bizOrgName, d.bizOrgName,
d.fireEquipmentCode, d.fireEquipmentCode,
d.fireEquipmentName, d.fireEquipmentName,
d.eq_point_name, d.eq_point_name,
d.e_value, d.e_value,
d.eq_point_unit, d.eq_point_unit,
d.source_name, d.source_name,
d.create_date d.create_date
FROM FROM
( (
SELECT SELECT
spe.biz_org_name AS bizOrgName, spe.biz_org_name AS bizOrgName,
det.`name` as fireEquipmentName, det.`name` as fireEquipmentName,
spe.`code` as fireEquipmentCode, spe.`code` as fireEquipmentCode,
ein.name as eq_point_name, ein.name as eq_point_name,
CASE ind.value WHEN 'true' THEN '是' CASE ind.value WHEN 'true' THEN '是'
WHEN 'false' THEN '否' WHEN 'false' THEN '否'
ELSE FORMAT(IFNULL(ind.value, 0), 2) END 'e_value', ELSE FORMAT(IFNULL(ind.value, 0), 2) END 'e_value',
ein.unit as eq_point_unit, ein.unit as eq_point_unit,
CONCAT(IFNULL(str.full_name,''),' ',IFNULL(sto.description,'')) as source_name, CONCAT(IFNULL(str.full_name,''),' ',IFNULL(sto.description,'')) as source_name,
ind.update_date as create_date ind.update_date as create_date
FROM FROM
wl_equipment_specific_index as ind wl_equipment_specific_index as ind
left join wl_equipment_specific as spe on spe.id = ind.equipment_specific_id 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_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_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_stock_detail as sto on sto.equipment_specific_id = spe.id
left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id
WHERE ind.`value` IS NOT NULL AND ind.`value` != '' AND ein.is_iot = 1 WHERE det.`name` IS NOT NULL AND ind.`value` IS NOT NULL AND ind.`value` != '' AND ein.is_iot = 1
) d ) d
<where> <where>
<if test="fireEquipmentName!=null"> <if test="fireEquipmentName!=null">
......
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