dev check violation for lawcase,complaint

2026-05-19 12:22:39 +07:00
parent 73ef7a57a3
commit 9dd1f8e6c8
1 changed files with 4 additions and 3 deletions
@@ -78,15 +78,16 @@ public class ViolationService {
            LocalDateTime endDate,
            String status,
            int page, int size, String sortDirection) {
+
        Specification<Violation> 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));
    }