Merge branch 'ADBWohneinheit/duplicate-view-add-netzgebiet-filter' into 'master'
added netzgebiet filter in duplicate view See merge request fronk/thetool!1398
This commit is contained in:
@@ -291,7 +291,7 @@ class ADBWohneinheitModel {
|
|||||||
FROM Wohneinheit
|
FROM Wohneinheit
|
||||||
LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id)
|
LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id)
|
||||||
WHERE $where AND Wohneinheit.extref IS NOT NULL
|
WHERE $where AND Wohneinheit.extref IS NOT NULL
|
||||||
GROUP BY Wohneinheit.extref
|
GROUP BY Wohneinheit.extref, Hausnummer.netzgebiet_id
|
||||||
HAVING COUNT(*) > 1
|
HAVING COUNT(*) > 1
|
||||||
ORDER BY COUNT(*) DESC";
|
ORDER BY COUNT(*) DESC";
|
||||||
|
|
||||||
@@ -351,7 +351,7 @@ class ADBWohneinheitModel {
|
|||||||
FROM Wohneinheit
|
FROM Wohneinheit
|
||||||
LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id)
|
LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id)
|
||||||
WHERE $where AND Wohneinheit.oaid IS NOT NULL
|
WHERE $where AND Wohneinheit.oaid IS NOT NULL
|
||||||
GROUP BY Wohneinheit.oaid
|
GROUP BY Wohneinheit.oaid, Hausnummer.netzgebiet_id
|
||||||
HAVING COUNT(*) > 1
|
HAVING COUNT(*) > 1
|
||||||
ORDER BY COUNT(*) DESC";
|
ORDER BY COUNT(*) DESC";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user