巡检统计数量调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -497,6 +497,10 @@ public class IotStaticController {
             ids = deptService.getChildDeptIdListFromCache(vo.getDeptId());
             ids.add(vo.getDeptId());
         }
+//        IotInspectOrderPageReqVO iotInspectOrderPageReqVO = new IotInspectOrderPageReqVO();
+//        iotInspectOrderPageReqVO.setStatus(vo.getStatus());
+//        iotInspectOrderPageReqVO.setCreateTime(vo.getCreateTime());
+//        Set<Long> collect2 = iotInspectOrderMapper.selectListByTimeAndStatus(iotInspectOrderPageReqVO).stream().map(IotInspectOrderDO::getId).collect(Collectors.toSet());
         List<IotInspectOrderDetailDO> detailDOList = iotInspectOrderDetailMapper.selectListStat(vo, ids);
         Map<Long, List<IotInspectOrderDetailDO>> collect = detailDOList.stream().collect(Collectors.groupingBy(IotInspectOrderDetailDO::getOrderId));
         AtomicInteger todo = new AtomicInteger();

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectOrderDetailMapper.java

@@ -41,6 +41,7 @@ public interface IotInspectOrderDetailMapper extends BaseMapperX<IotInspectOrder
     default List<IotInspectOrderDetailDO> selectListStat(IotCountDataDO vo, Set<Long> ids) {
         return selectList(new LambdaQueryWrapperX<IotInspectOrderDetailDO>()
                 .betweenIfPresent(IotInspectOrderDetailDO::getCreateTime, vo.getCreateTime())
+//                .inIfPresent(IotInspectOrderDetailDO::getOrderId, orderIds)
                 .inIfPresent(IotInspectOrderDetailDO::getDeptId, ids)
         );
     }

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

@@ -21,7 +21,7 @@
         max(dept_id) dept_id,
             '未填写' AS if_normal
         FROM
-        rq_iot_inspect_order_detail
+        rq_iot_inspect_order_detail de where de.deleted=0
         GROUP BY
         order_id, device_id
         HAVING
@@ -65,7 +65,7 @@
         max(dept_id) dept_id,
         '已填写' AS if_normal
         FROM
-        rq_iot_inspect_order_detail
+        rq_iot_inspect_order_detail de where de.deleted=0
         GROUP BY
         order_id, device_id
         HAVING