backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

dev fix sort
Test Workflow / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
backdev
2026-04-24 13:24:50 +07:00
parent 0047cfd4f6
commit ab4151b68b
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/repository/ViolationRepository.java
+6
View File
@@ -42,6 +42,8 @@ public interface ViolationRepository extends JpaRepository<Violation, Long> {
List<Violation> findByFileEntityIn(List<FileEntity> files); List<Violation> findByFileEntityIn(List<FileEntity> files);
List<Violation> findByFileEntityInAndStatusNot(List<FileEntity> files, String excludeStatus);
Page<Violation> findByFileEntityIn(List<FileEntity> files, Pageable pageable); Page<Violation> findByFileEntityIn(List<FileEntity> files, Pageable pageable);
Page<Violation> findByFileEntityInAndStatus(List<FileEntity> files, String status, Pageable pageable); Page<Violation> findByFileEntityInAndStatus(List<FileEntity> files, String status, Pageable pageable);
@@ -58,6 +60,10 @@ public interface ViolationRepository extends JpaRepository<Violation, Long> {
LocalDateTime startDate, LocalDateTime startDate,
LocalDateTime endDate); LocalDateTime endDate);
List<Violation> findByFileEntityInAndCreatedDateBetweenAndStatusNot(List<FileEntity> files,
LocalDateTime startDate,
LocalDateTime endDate, String excludeStatus);
Page<Violation> findByFileEntityInAndStatusNot(List<FileEntity> files, String excludeStatus, Pageable pageable); Page<Violation> findByFileEntityInAndStatusNot(List<FileEntity> files, String excludeStatus, Pageable pageable);
Page<Violation> findByFileEntityInAndStatusNotAndStatus(List<FileEntity> files, String excludeStatus, Page<Violation> findByFileEntityInAndStatusNotAndStatus(List<FileEntity> files, String excludeStatus,
src/main/java/ru/soune/nocopy/service/violation/ViolationService.java
+6 -3
View File
@@ -137,13 +137,16 @@ public class ViolationService {
List<Violation> violations; List<Violation> violations;
if (status != null && !status.isEmpty() && startDate != null && endDate != null) { if (status != null && !status.isEmpty() && startDate != null && endDate != null) {
violations = violationRepository.findByFileEntityInAndStatusAndCreatedDateBetween(files, status, startDate, endDate); violations = violationRepository.findByFileEntityInAndStatusAndCreatedDateBetween(files, status,
startDate, endDate);
} else if (status != null && !status.isEmpty()) { } else if (status != null && !status.isEmpty()) {
violations = violationRepository.findByFileEntityInAndStatus(files, status); violations = violationRepository.findByFileEntityInAndStatus(files, status);
} else if (startDate != null && endDate != null) { } else if (startDate != null && endDate != null) {
violations = violationRepository.findByFileEntityInAndCreatedDateBetween(files, startDate, endDate); violations = violationRepository.findByFileEntityInAndCreatedDateBetweenAndStatusNot(files, startDate,
endDate, ViolationStatus.NOT_OWNER_FILE.name());
} else { } else {
violations = violationRepository.findByFileEntityIn(files); violations = violationRepository.findByFileEntityInAndStatusNot(files,
ViolationStatus.NOT_OWNER_FILE.name());
} }
Map<String, Long> grouped = violations.stream() Map<String, Long> grouped = violations.stream()