Merge branch 'dev_v2.0.0' into master_v2.0.0

merge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -167,21 +167,19 @@ public class CreatePdfUtil {
 //        }
 
         for (ExamStudentCourseDto e : examStudentList) {
-            if (Objects.nonNull(e.getSiteNumber()) && Objects.equals(e.getSiteNumber(), "")) {
-                char[] chars = e.getSiteNumber().toLowerCase().toCharArray();
-                String ascii = "";
-                for (int i = 0; i < chars.length; i++) {
-                    ascii = ascii + chars[i];
-                }
-                e.setAscii(ascii);
+            char[] chars = e.getSiteNumber().toLowerCase().toCharArray();
+            String ascii = "";
+            for (int i = 0; i < chars.length; i++) {
+                ascii = ascii + chars[i];
             }
+            e.setAscii(ascii);
         }
 
         Optional<ExamStudentCourseDto> minSite = null;
         Optional<ExamStudentCourseDto> maxSite = null;
         if (Objects.nonNull(examStudentList) && examStudentList.size() > 0) {
-            minSite = examStudentList.stream().min(Comparator.comparing(s -> Objects.nonNull(s.getAscii()) ? Integer.parseInt(s.getAscii()) : -1));
-            maxSite = examStudentList.stream().max(Comparator.comparing(s -> Objects.nonNull(s.getAscii()) ? Integer.parseInt(s.getAscii()) : -1));
+            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(""));