Adjust query to also add households in the list that do not have an address

This commit is contained in:
Julie Lenaerts 2024-10-29 14:32:37 +01:00
parent f7f8319749
commit 5629a0c124

View File

@ -219,11 +219,14 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
$qb $qb
->leftJoin('household.addresses', 'addresses') ->leftJoin('household.addresses', 'addresses')
->andWhere( ->andWhere(
$qb->expr()->andX( $qb->expr()->orX(
$qb->expr()->lte('addresses.validFrom', ':calcDate'), $qb->expr()->isNull('addresses'), // Include households without any address
$qb->expr()->orX( $qb->expr()->andX(
$qb->expr()->isNull('addresses.validTo'), $qb->expr()->lte('addresses.validFrom', ':calcDate'),
$qb->expr()->gt('addresses.validTo', ':calcDate') $qb->expr()->orX(
$qb->expr()->isNull('addresses.validTo'),
$qb->expr()->gt('addresses.validTo', ':calcDate')
)
) )
) )
); );