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 04825e4..1957ec9 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 @@ -63,7 +63,7 @@ null::integer as hzb_jahr, null::date as hzb_datum , null::decimal(14,7) as hzb_note, null::char(10) as abm_art_s, -rank () over (partition by SM.st_sem_nr, S.st_studstamm_nr, SG.studiengangs_identifikator order by SA.gueltig_ab desc) as status_historie +rank () over (partition by SM.st_sem_nr, S.st_studstamm_nr, SG.studiengangs_identifikator order by SA.gueltig_ab desc,SA.studienstatustyp desc) as status_historie --rank () over (partition by SM.st_sem_nr, S.st_studstamm_nr, SG.studiengangs_identifikator order by (case when SA.gueltig_ab =SM.semester_ende then date_val('01.01.1900') else SA.gueltig_ab end) desc) as status_historie into temp tmp_studien FROM costage_st_studierendenstammdaten S, @@ -88,7 +88,7 @@ and (SA.studienstatustyp not in ('Z','X') or ( and SA.gueltig_ab <= today() and date(SA.gueltig_ab) < date(SM.semester_ende) )) --Studis außer erst/neueinschr/rückmeld/beurlaubt werden in der Semestermitte exmatr. zum Endedatum Semesterende, wenn dieses Datum in der Zukunft liegt soll der Studi mit dem vorherigen Status erscheinen ---and SA.studienstatustyp not in ('a','o') +and SA.studienstatustyp not in ('a','o','z') --group by 1,2,3,4,5,6,7,8,9,10,11,12,13 and ${COSTAGE_STUDENT_FILTER} and SM.semester_tid >= ${beginn_semester} diff --git a/src-modules/module/costage/rohdaten/db-co.properties.sam b/src-modules/module/costage/rohdaten/db-co.properties.sam index 3d8f9cc..1258db4 100644 --- a/src-modules/module/costage/rohdaten/db-co.properties.sam +++ b/src-modules/module/costage/rohdaten/db-co.properties.sam @@ -3,7 +3,7 @@ driverName=oracle.jdbc.OracleDriver maxIdle= logLevelXML=FINEST maxActive= -connectionName=CO_INTERFACE_PX_SUPERX +connectionName=CO_INTERFACE_PUBLIC_EXTERNAL minIdle=5 logLevelSQL=FINEST connectionURL=jdbc\:oracle\:thin\:@192.168.0.11\:1521\:coprod diff --git a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml index 3e81188..337da12 100644 --- a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml +++ b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml @@ -217,7 +217,7 @@ F.hssem, (case when praxissemester >0 then '3' else '' end) as stuart, '' ,--stutyp, F.stufrm, -'' ,--stort, +G.stort_nr ,--stort, F.ruebeudat, null::char(1) ,--semgewicht, null::char(1) ,--stggewicht,