This commit is contained in:
@@ -18,5 +18,7 @@ public class FileViolationSummaryDTO {
|
|||||||
private FileStatus status;
|
private FileStatus status;
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private long violationCount;
|
private long violationCount;
|
||||||
|
private long countLawCase;
|
||||||
|
private long countComplaint;
|
||||||
private LocalDateTime latestViolationDate;
|
private LocalDateTime latestViolationDate;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ public class ViolationService {
|
|||||||
List<FileViolationSummaryDTO> allDTOs = violationsByFileId.entrySet().stream()
|
List<FileViolationSummaryDTO> allDTOs = violationsByFileId.entrySet().stream()
|
||||||
.map(entry -> {
|
.map(entry -> {
|
||||||
List<Violation> fileViolations = entry.getValue();
|
List<Violation> fileViolations = entry.getValue();
|
||||||
|
List<Long> violationIds = fileViolations.stream().map(Violation::getId).toList();
|
||||||
FileEntity file = fileViolations.get(0).getFileEntity();
|
FileEntity file = fileViolations.get(0).getFileEntity();
|
||||||
|
|
||||||
LocalDateTime latestDate = fileViolations.stream()
|
LocalDateTime latestDate = fileViolations.stream()
|
||||||
@@ -109,6 +110,8 @@ public class ViolationService {
|
|||||||
.createdAt(file.getCreatedAt())
|
.createdAt(file.getCreatedAt())
|
||||||
.violationCount(fileViolations.size())
|
.violationCount(fileViolations.size())
|
||||||
.latestViolationDate(latestDate)
|
.latestViolationDate(latestDate)
|
||||||
|
.countComplaint(complaintRepository.countComplaintByViolations(violationIds))
|
||||||
|
.countLawCase(lawCaseRepository.countLawCaseByViolationIds(violationIds))
|
||||||
.build();
|
.build();
|
||||||
})
|
})
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|||||||
Reference in New Issue
Block a user