巡检工单提交

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectOrderServiceImpl.java

@@ -146,13 +146,15 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
                         List<IotInspectOrderDetailDO> deviceIdDetails = iotInspectOrderDetailMapper.selectByTimeAndOrderIdAndDeviceId(iotInspectOrderDetailPageReqVO);
                         Map<Long, List<IotInspectOrderDetailDO>> otherOrderMap = deviceIdDetails.stream().filter(e -> !orderId.equals(e.getOrderId())).collect(Collectors.groupingBy(IotInspectOrderDetailDO::getOrderId));
                         otherOrderMap.forEach((k, v) -> {
-                            iotInspectOrderDetailPageReqVO.setDeviceId(null);
-                            iotInspectOrderDetailPageReqVO.setOrderId(k);
-                            List<IotInspectOrderDetailDO> orderIdDetails = iotInspectOrderDetailMapper.selectByTimeAndOrderIdAndDeviceId(iotInspectOrderDetailPageReqVO);
+//                            iotInspectOrderDetailPageReqVO.setDeviceId(null);
+//                            iotInspectOrderDetailPageReqVO.setOrderId(k);
+//                            List<IotInspectOrderDetailDO> orderIdDetails = iotInspectOrderDetailMapper.selectByTimeAndOrderIdAndDeviceId(iotInspectOrderDetailPageReqVO);
+                            Map<Long, List<IotInspectOrderDetailDO>> collect1 = v.stream().collect(Collectors.groupingBy(IotInspectOrderDetailDO::getDeviceId));
                             //删除巡检明细
                             v.forEach(f -> iotInspectOrderDetailMapper.deleteById(f));
                             //如果工单里面只有这一个设备的话,删除该工单
-                            if (v.size()==orderIdDetails.size()) {
+//                            if (v.size()==orderIdDetails.size()) {
+                            if (collect1.size()==1) {
                                 iotInspectOrderMapper.deleteById(k);
                             }