From 9dd1f8e6c8e1e878892df079a699714c7eb0f924 Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Tue, 19 May 2026 12:22:39 +0700 Subject: [PATCH] dev check violation for lawcase,complaint --- .../soune/nocopy/service/violation/ViolationService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java index a71f7d3..501f9dc 100644 --- a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java +++ b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java @@ -78,15 +78,16 @@ public class ViolationService { LocalDateTime endDate, String status, int page, int size, String sortDirection) { + Specification spec = (root, query, cb) -> cb.conjunction(); if (targetFiles != null && !targetFiles.isEmpty()) { - spec = spec.and((root, query, cb) -> root.get("file").in(targetFiles)); + spec = spec.and((root, query, cb) -> root.get("fileEntity").in(targetFiles)); } if (startDate != null && endDate != null) { spec = spec.and((root, query, cb) -> - cb.between(root.get("violationDate"), startDate, endDate)); + cb.between(root.get("createdDate"), startDate, endDate)); } if (status != null && !status.isEmpty()) { @@ -95,7 +96,7 @@ public class ViolationService { } Sort sort = Sort.by("ASC".equalsIgnoreCase(sortDirection) ? - Sort.Direction.ASC : Sort.Direction.DESC, "violationDate"); + Sort.Direction.ASC : Sort.Direction.DESC, "createdDate"); return violationRepository.findAll(spec, PageRequest.of(page, size, sort)); }