设备使用

coffee-system/src/main/resources/mapper/bus/BusDeviceAlarmMapper.xml

@@ -25,25 +25,25 @@
         AND da.update_time <= #{query.uploadTimeMax}
         </if>
         <if test="query.alarm != null">
-        AND da.alarm = #{alarm}
+        AND da.alarm = #{query.alarm}
         </if>
         <if test="query.alarmState != null">
-        AND da.alarm_state = #{alarmState}
+        AND da.alarm_state = #{query.alarmState}
         </if>
         <if test="query.warnWillFinished != null">
-        AND da.warn_will_finished = #{warnWillFinished}
+        AND da.warn_will_finished = #{query.warnWillFinished}
         </if>
         <if test="query.warnLowBattery != null">
-        AND da.warn_low_battery = #{warnLowBattery}
+        AND da.warn_low_battery = #{query.warnLowBattery}
         </if>
         <if test="query.warnAnalgesicPoor != null">
-        AND da.warn_analgesic_poor = #{warnAnalgesicPoor}
+        AND da.warn_analgesic_poor = #{query.warnAnalgesicPoor}
         </if>
         <if test="query.tenantId != null">
-        AND da.tenant_id = #{tenantId}
+        AND da.tenant_id = #{query.tenantId}
         </if>
         <if test="query.type != null">
-        AND d.type = #{type}
+        AND d.type = #{query.type}
         </if>
 
     </select>