Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/IotOperationPlanJob.java

@@ -50,6 +50,7 @@ import static cn.iocoder.yudao.module.pms.framework.config.MultiThreadConfigurat
 public class IotOperationPlanJob implements JobHandler {
 
 
+
     @Autowired
     private IotOpeationFillMapper iotOpeationFillMapper;
     @Autowired

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotOpeationFillMapper.xml

@@ -1049,10 +1049,11 @@
 
     <select id="devStatus" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO">
-        SELECT order_status
+        SELECT device_status
         FROM rq_iot_device
         WHERE dept_id = #{deptId}
           AND asset_class in (159,160)
+            LIMIT 1
     </select>
 
     <select id="isReport" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO"