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

dev check violation for lawcase,complaint
Test Workflow / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
backdev
2026-05-19 12:11:14 +07:00
parent 284bde0e27
commit 73ef7a57a3
3 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/handler/ViolationHandler.java
+26 -17
View File
@@ -135,23 +135,32 @@ public class ViolationHandler implements RequestHandler {
.messageBody(groupedData)
.build();
} else {
Page<Violation> violationPage;
if (startDate != null && endDate != null) {
violationPage = violationService.getViolationsByFilesAndDateRange(
targetFiles, startDate, endDate,
violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
);
} else if (violationRequest.getStatus() != null && !violationRequest.getStatus().isEmpty()) {
violationPage = violationService.getViolationsByFilesAndStatus(
targetFiles, violationRequest.getStatus(),
violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
);
} else {
violationPage = violationService.getViolationsByFiles(
targetFiles, violationRequest.getPage(), violationRequest.getSize(),
violationRequest.getSortDirection());
}
// Page<Violation> violationPage;
//
// if (startDate != null && endDate != null) {
// violationPage = violationService.getViolationsByFilesAndDateRange(
// targetFiles, startDate, endDate,
// violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
// );
// } else if (violationRequest.getStatus() != null && !violationRequest.getStatus().isEmpty()) {
// violationPage = violationService.getViolationsByFilesAndStatus(
// targetFiles, violationRequest.getStatus(),
// violationRequest.getPage(), violationRequest.getSize(), violationRequest.getSortDirection()
// );
// } else {
// violationPage = violationService.getViolationsByFiles(
// targetFiles, violationRequest.getPage(), violationRequest.getSize(),
// violationRequest.getSortDirection());
// }
Page<Violation> violationPage = violationService.getViolationsByFilesAndFilters(
targetFiles,
startDate,
endDate,
violationRequest.getStatus(),
violationRequest.getPage(),
violationRequest.getSize(),
violationRequest.getSortDirection()
);
ViolationResponse.ViolationDto firstShowViolation = null;
List<Violation> content = violationPage.getContent();