|
@@ -102,7 +102,8 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
|
|
|
ids.add(deptId);
|
|
|
}
|
|
|
Set<Long> collect = iotDeviceMapper.selectSimpleList(new IotDevicePageReqVO(), ids).stream().map(IotDeviceDO::getId).collect(Collectors.toSet());
|
|
|
- boolean ma = iotInspectOrderDetailMapper.selectList("order_id", orderId).stream().filter(e -> collect.contains(e.getDeviceId())).anyMatch(f -> Objects.isNull(f.getIfNormal()));
|
|
|
+ List<IotInspectOrderDetailDO> orderId1 = iotInspectOrderDetailMapper.selectList("order_id", orderId).stream().filter(e -> collect.contains(e.getDeviceId())).collect(Collectors.toList());
|
|
|
+ boolean ma = orderId1.stream().anyMatch(f -> Objects.isNull(f.getIfNormal()));
|
|
|
if (!ma) {
|
|
|
order.setStatus("finished");
|
|
|
}
|