diff --git a/src-modules/module/costage/conf/costage.xml b/src-modules/module/costage/conf/costage.xml index e509b95..0832b05 100644 --- a/src-modules/module/costage/conf/costage.xml +++ b/src-modules/module/costage/conf/costage.xml @@ -436,6 +436,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" /> + diff --git a/src-modules/module/costage/hilfstabellen/costage_st_studien_aggr_fuellen.sql b/src-modules/module/costage/hilfstabellen/costage_st_studien_aggr_fuellen.sql index 13fc5be..0064a7c 100644 --- a/src-modules/module/costage/hilfstabellen/costage_st_studien_aggr_fuellen.sql +++ b/src-modules/module/costage/hilfstabellen/costage_st_studien_aggr_fuellen.sql @@ -39,6 +39,7 @@ null::date as anfdat, null::date as ruebeudat, null::date as endedat, null::smallint as kz_rueck_beur_ein, +null::char(10) as hzb_art, rank () over (partition by SM.st_sem_nr, S.st_studstamm_nr, SG.studiengangs_identifikator order by SA.gueltig_ab desc) as status_historie into temp tmp_studien FROM costage_st_studierendenstammdaten S, @@ -46,7 +47,6 @@ FROM costage_st_studierendenstammdaten S, costage_st_semester SM, costage_st_studiengaenge SG , costage_st_studienstatus SA - costage_bw_bewerb_hzb BW --apa where @@ -60,7 +60,6 @@ and SG.studiengangs_typ_kb in ('ESG','TSG') and SA.st_studium_nr=ST.st_studium_nr and SA.st_sem_nr=SM.st_sem_nr and SA.studienstatustyp not in ('a','o') -and S.st_studstamm_nr =BW.st_studstamm_nr --apa and ${COSTAGE_STUDENT_FILTER} --group by 1,2,3,4,5,6,7,8,9,10,11,12,13 ; @@ -88,6 +87,14 @@ and F.fachsemestertyp='FS' ; +update tmp_studien +set hzb_art=H.hzb_art_stla_code +from costage_bw_bewerb_hzb H, costage_bw_bewerbungen BW +where tmp_studien.st_studstamm_nr = BW.st_studstamm_nr +and BW.nr=H.bw_bewrbng_nr +; + + select T.*,1::smallint as primaerflag into temp tmp_studien2 from tmp_studien T, costage_st_hauptstudien H @@ -214,6 +221,7 @@ st_studium_nr, endedat, stufrm, kz_rueck_beur_ein, + hzb_art, summe ) @@ -266,6 +274,7 @@ select st_studium_nr, else null::date end) as endedat, studienform_statistik_code as stufrm, kz_rueck_beur_ein, + hzb_art, 1 as summe from tmp_studien2 -- where semester = 20202 @@ -295,6 +304,7 @@ st_studium_nr, endedat, stufrm, kz_rueck_beur_ein, + hzb_art, summe ) @@ -330,6 +340,7 @@ cast (NULL as int) as studiengang_nr2, else null::date end) as endedat, studienform_statistik_code as stufrm, kz_rueck_beur_ein, + hzb_art, 1 as summe from tmp_studien2 --where semester = 20202