Zimo 17 ore fa
parent
commit
b29b1fa056

+ 2 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotDeviceMapper.xml

@@ -649,7 +649,7 @@
             </foreach>
         </if>
         )a
-        left JOIN (select DISTINCT(device_id) from rq_iot_failure_report where `status`!='finished')b
+        left JOIN (select DISTINCT(device_id) from rq_iot_failure_report where `status`!='finished' and `status`!='oareject' and `status`!='reporting' and if_stop=1)b
         on a.id=b.device_id where b.device_id is not NULL
     </select>
     <select id="getRepairCount" resultType="java.lang.Long">
@@ -670,7 +670,7 @@
             </foreach>
         </if>
         )a
-        left JOIN (select DISTINCT(device_id) from rq_iot_maintain where `status`!='finished')b
+        left JOIN (select DISTINCT(device_id) from rq_iot_maintain where `status`!='finished' and `status`!='oareject' and if_stop=1)b
         on a.id=b.device_id where b.device_id is not NULL
     </select>
 </mapper>