修改物联日志bug

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

@@ -702,63 +702,73 @@
     </select> -->
     <select id="queryForZXJFireEquipmentHistoryCount" resultType="long">
         SELECT
-        COUNT(1)
+            COUNT(1)
         FROM
         (
-        SELECT
-        det.`name` as fireEquipmentName,
-        spe.`code` as fireEquipmentCode,
-        ind.update_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
-        WHERE ind.`value` IS NOT NULL AND ind.`value` != ''
+            SELECT
+            spe.biz_org_name AS bizOrgName,
+            det.`name` as fireEquipmentName,
+            spe.`code` as fireEquipmentCode,
+            ein.name as eq_point_name,
+            CASE ind.value WHEN 'true' THEN '是'
+            WHEN 'false' THEN '否'
+            ELSE FORMAT(IFNULL(ind.value, 0), 2) END 'e_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
         <where>
             <if test="fireEquipmentName!=null">
                 AND d.fireEquipmentName LIKE '%${fireEquipmentName}%'
             </if>
             <if test="startTime != null and startTime != ''">
-                AND d.update_date &gt;= #{startTime}
+                AND d.create_date &gt;= #{startTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND d.update_date &lt;= #{endTime}
+                AND d.create_date &lt;= #{endTime}
             </if>
         </where>
     </select>
 
     <select id="queryForZXJFireEquipmentHistory" resultType="map">
         SELECT
-        d.bizOrgName,
-        d.fireEquipmentCode,
-        d.fireEquipmentName,
-        d.eq_point_name,
-        d.e_value,
-        d.eq_point_unit,
-        d.source_name,
-        d.create_date
+            d.bizOrgName,
+            d.fireEquipmentCode,
+            d.fireEquipmentName,
+            d.eq_point_name,
+            d.e_value,
+            d.eq_point_unit,
+            d.source_name,
+            d.create_date
         FROM
         (
-        SELECT
-        spe.biz_org_name AS bizOrgName,
-        det.`name` as fireEquipmentName,
-        spe.`code` as fireEquipmentCode,
-        ein.name as eq_point_name,
-        CASE ind.value WHEN 'true' THEN '是'
-        WHEN 'false' THEN '否'
-        ELSE FORMAT(IFNULL(ind.value, 0), 2) END 'e_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 ind.`value` IS NOT NULL AND ind.`value` != '' AND ein.is_iot = 1
+            SELECT
+            spe.biz_org_name AS bizOrgName,
+            det.`name` as fireEquipmentName,
+            spe.`code` as fireEquipmentCode,
+            ein.name as eq_point_name,
+            CASE ind.value WHEN 'true' THEN '是'
+            WHEN 'false' THEN '否'
+            ELSE FORMAT(IFNULL(ind.value, 0), 2) END 'e_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
         <where>
             <if test="fireEquipmentName!=null">