From fa7b55d19ce4c6d2df4c94296ddb01fddb9e13a4 Mon Sep 17 00:00:00 2001 From: gsd Date: Sat, 13 Jun 2026 00:22:02 +0300 Subject: [PATCH] reports ids --- .../controllers/user/PublicController.java | 1 + .../entities/report/ReportSearchFilter.java | 22 +++++++++++++++++++ .../app/repositories/ReportRepository.java | 3 +++ 3 files changed, 26 insertions(+) diff --git a/src/main/java/app/controllers/user/PublicController.java b/src/main/java/app/controllers/user/PublicController.java index c6ed14a..4d7d362 100644 --- a/src/main/java/app/controllers/user/PublicController.java +++ b/src/main/java/app/controllers/user/PublicController.java @@ -115,6 +115,7 @@ public class PublicController { String rl = reportSearchFilter.getAccounts2Steam2(profileService); return reportRepository.getReports(pageable, + reportSearchFilter.idsIsEmpty(), reportSearchFilter.idsIsEmpty() ? List.of(0L) : reportSearchFilter.getIds(), al.isEmpty(), al, rl.isEmpty(), rl, reportSearchFilter.getServerId(), diff --git a/src/main/java/app/entities/report/ReportSearchFilter.java b/src/main/java/app/entities/report/ReportSearchFilter.java index ea4686c..c1b67a3 100644 --- a/src/main/java/app/entities/report/ReportSearchFilter.java +++ b/src/main/java/app/entities/report/ReportSearchFilter.java @@ -3,10 +3,12 @@ package app.entities.report; import app.entities.SearchFilter; import app.services.ProfileService; +import java.util.ArrayList; import java.util.List; import java.util.Objects; public class ReportSearchFilter extends SearchFilter { + private List ids = new ArrayList<>(); private List accounts_2 = null; public ReportSearchFilter() { @@ -26,4 +28,24 @@ public class ReportSearchFilter extends SearchFilter { .map(sId -> sId.steam2) .toList()); } + + public boolean idsIsEmpty() { + return ids == null || ids.isEmpty(); + } + + public List getIds() { + return ids; + } + + public void setIds(List ids) { + this.ids = ids; + } + + public List getAccounts_2() { + return accounts_2; + } + + public void setAccounts_2(List accounts_2) { + this.accounts_2 = accounts_2; + } } diff --git a/src/main/java/app/repositories/ReportRepository.java b/src/main/java/app/repositories/ReportRepository.java index 37963a9..f587732 100644 --- a/src/main/java/app/repositories/ReportRepository.java +++ b/src/main/java/app/repositories/ReportRepository.java @@ -11,6 +11,7 @@ import java.util.List; public interface ReportRepository extends PagingAndSortingRepository { @Query(value = "select r from Report r where " + + "(:ids_is_empty = true or r in :ids) and " + "(:authors_ne = true or (position(r.a_steam2 in :authors) > 0 or position(r.r_steam2 in :authors) > 0)) and " + "(:reportes_ne = true or position(r.r_steam2 in :reportes) > 0) and " + "(:begin_date is null or r.utime >= :begin_date) and " + @@ -18,6 +19,8 @@ public interface ReportRepository extends PagingAndSortingRepository getReports(Pageable pageable, + @Param("ids_is_empty") boolean idsIsEmpty, + @Param("ids") List ids, @Param("authors_ne") boolean authors_ne,//a @Param("authors") String authors, @Param("reportes_ne") boolean reportes_ne,//r