pcvolkmer/onkostar-plugin-dnpm
1
0
Fork 0
mirror of https://github.com/pcvolkmer/onkostar-plugin-dnpm.git synced 2025-07-05 02:22:54 +00:00
Code Issues Activity

Issue #4: Ermittle Studien mit Namen der Kategorie

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2023-03-14 15:11:50 +01:00
parent fcb7e6c14d
commit 599b8687b1
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/DNPM/services/DefaultStudienService.java
View File

@ -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)
));
}
}