|
@@ -168,18 +168,18 @@ public class CreatePdfUtil {
|
|
|
|
|
|
for (ExamStudentCourseDto e : examStudentList) {
|
|
for (ExamStudentCourseDto e : examStudentList) {
|
|
char[] chars = e.getSiteNumber().toLowerCase().toCharArray();
|
|
char[] chars = e.getSiteNumber().toLowerCase().toCharArray();
|
|
- int ascii = 0;
|
|
|
|
|
|
+ String ascii = "";
|
|
for (int i = 0; i < chars.length; i++) {
|
|
for (int i = 0; i < chars.length; i++) {
|
|
ascii = ascii + chars[i];
|
|
ascii = ascii + chars[i];
|
|
- e.setAscii(ascii);
|
|
|
|
}
|
|
}
|
|
|
|
+ e.setAscii(ascii);
|
|
}
|
|
}
|
|
|
|
|
|
Optional<ExamStudentCourseDto> minSite = null;
|
|
Optional<ExamStudentCourseDto> minSite = null;
|
|
Optional<ExamStudentCourseDto> maxSite = null;
|
|
Optional<ExamStudentCourseDto> maxSite = null;
|
|
if (Objects.nonNull(examStudentList) && examStudentList.size() > 0) {
|
|
if (Objects.nonNull(examStudentList) && examStudentList.size() > 0) {
|
|
- minSite = examStudentList.stream().min(Comparator.comparing(ExamStudentCourseDto::getAscii));
|
|
|
|
- maxSite = examStudentList.stream().max(Comparator.comparing(ExamStudentCourseDto::getAscii));
|
|
|
|
|
|
+ minSite = examStudentList.stream().min(Comparator.comparing(s -> Integer.parseInt(s.getAscii())));
|
|
|
|
+ maxSite = examStudentList.stream().max(Comparator.comparing(s -> Integer.parseInt(s.getAscii())));
|
|
}
|
|
}
|
|
|
|
|
|
htmlMap.put("minSite", Optional.ofNullable(minSite).map(s -> s.get().getSiteNumber()).orElse(""));
|
|
htmlMap.put("minSite", Optional.ofNullable(minSite).map(s -> s.get().getSiteNumber()).orElse(""));
|