diff options
| author | Paul-Christian Volkmer | 2023-03-14 15:11:50 +0100 |
|---|---|---|
| committer | Paul-Christian Volkmer | 2023-03-14 15:22:03 +0100 |
| commit | 599b8687b1fc24cc585afc6dfd54f20e722fe5c4 (patch) | |
| tree | f001e9b2f6ce4ee0b1f3eee1e0914b805645564e /src/main/java/DNPM/services/DefaultStudienService.java | |
| parent | fcb7e6c14d98db3bced722f231aa4c7686594526 (diff) | |
Issue #4: Ermittle Studien mit Namen der Kategorie
Diffstat (limited to 'src/main/java/DNPM/services/DefaultStudienService.java')
| -rw-r--r-- | src/main/java/DNPM/services/DefaultStudienService.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/main/java/DNPM/services/DefaultStudienService.java b/src/main/java/DNPM/services/DefaultStudienService.java index 8dbdb32..596a288 100644 --- a/src/main/java/DNPM/services/DefaultStudienService.java +++ b/src/main/java/DNPM/services/DefaultStudienService.java @@ -22,37 +22,41 @@ public class DefaultStudienService implements StudienService { @Override public List<Studie> findAll() { - var sql = "SELECT property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue " + var sql = "SELECT pcc.name, property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue " + "JOIN property_catalogue_version ON property_catalogue.id = property_catalogue_version.datacatalog_id " + "JOIN property_catalogue_version_entry pcve ON property_catalogue_version.id = pcve.property_version_id " + + "JOIN property_catalogue_category pcc on property_catalogue_version.id = pcc.version_id " + "LEFT JOIN studie ON pcve.id = studie.property_version_entry AND studie.aktiv " + "WHERE property_catalogue.name = 'OS.Studien';"; return this.jdbcTemplate.query(sql, (resultSet, i) -> new Studie( - resultSet.getString(1), + resultSet.getString(0), + resultSet.getInt(1), resultSet.getString(2), resultSet.getString(3), resultSet.getString(4), - resultSet.getInt(0) + resultSet.getString(5) )); } @Override public List<Studie> findByQuery(String query) { - var sql = "SELECT property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue " + var sql = "SELECT pcc.name, property_catalogue_version.version_number, studie.studien_nummer, pcve.code, pcve.shortdesc, pcve.description FROM property_catalogue " + "JOIN property_catalogue_version ON property_catalogue.id = property_catalogue_version.datacatalog_id " + "JOIN property_catalogue_version_entry pcve ON property_catalogue_version.id = pcve.property_version_id " + + "JOIN property_catalogue_category pcc on property_catalogue_version.id = pcc.version_id " + "LEFT JOIN studie ON pcve.id = studie.property_version_entry AND studie.aktiv " + "WHERE property_catalogue.name = 'OS.Studien' AND (pcve.shortdesc LIKE ? OR pcve.description LIKE ? OR studie.studien_nummer LIKE ?);"; var like = String.format("%%%s%%", query); return this.jdbcTemplate.query(sql, new Object[]{like, like, like}, (resultSet, i) -> new Studie( - resultSet.getString(1), + resultSet.getString(0), + resultSet.getInt(1), resultSet.getString(2), resultSet.getString(3), resultSet.getString(4), - resultSet.getInt(0) + resultSet.getString(5) )); } } |