From 1376509a370d4d49e406d5e39b213b6785026316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 31 Mar 2020 10:48:06 +0200 Subject: [PATCH] Adapted SQL for MessageJob --- .../controllers/jobs/OneTimeMessages.php | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/application/controllers/jobs/OneTimeMessages.php b/application/controllers/jobs/OneTimeMessages.php index 5d00611fd..66efe3da5 100644 --- a/application/controllers/jobs/OneTimeMessages.php +++ b/application/controllers/jobs/OneTimeMessages.php @@ -37,6 +37,7 @@ class OneTimeMessages extends JOB_Controller $queryParams = array( $semester, $studyCourseType, + $semester, $studyCourseType, $semester, $studyCourseType @@ -49,28 +50,29 @@ class OneTimeMessages extends JOB_Controller FROM public.tbl_prestudent p JOIN public.tbl_prestudentstatus ps USING (prestudent_id) JOIN public.tbl_studiengang s USING (studiengang_kz) - WHERE ps.status_kurzbz = \'Interessent\' + WHERE ps.status_kurzbz = \'Wartender\' AND ps.studiensemester_kurzbz = ? - AND ps.datum >= NOW() - \''.$months.' months\'::interval + AND ps.datum <= NOW() - \''.$months.' months\'::interval AND s.typ = ? - AND p.prestudent_id NOT IN ( - SELECT pp.prestudent_id + AND NOT EXISTS ( + SELECT pp.person_id FROM public.tbl_prestudent pp JOIN public.tbl_prestudentstatus pss USING (prestudent_id) JOIN public.tbl_studiengang ss USING (studiengang_kz) WHERE pss.status_kurzbz = \'Aufgenommener\' + AND pss.studiensemester_kurzbz = ? AND ss.typ = ? - AND pp.prestudent_id = p.prestudent_id + AND pp.person_id = p.person_id ) - AND p.prestudent_id NOT IN ( - SELECT pp.prestudent_id + AND NOT EXISTS ( + SELECT pp.person_id FROM public.tbl_prestudent pp JOIN public.tbl_prestudentstatus pss USING (prestudent_id) JOIN public.tbl_studiengang ss USING (studiengang_kz) - WHERE pss.status_kurzbz = \'Bewerber\' + WHERE pss.status_kurzbz = \'Student\' AND pss.studiensemester_kurzbz = ? AND ss.typ = ? - AND pp.prestudent_id = p.prestudent_id + AND pp.person_id = p.person_id )', $queryParams ); @@ -114,4 +116,3 @@ class OneTimeMessages extends JOB_Controller $this->logInfo('Send message to applicants still waiting end'); } } -