Merge branch 'dev_v2.0.0' into master_v2.0.0

merge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamStudentCourseDto.java

@@ -29,13 +29,13 @@ public class ExamStudentCourseDto extends ExamStudent {
     private String paperNumber;
 
     @ApiModelProperty("排序用")
-    int ascii;
+    String ascii;
 
-    public int getAscii() {
+    public String getAscii() {
         return ascii;
     }
 
-    public void setAscii(int ascii) {
+    public void setAscii(String ascii) {
         this.ascii = ascii;
     }
 

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

@@ -168,18 +168,18 @@ public class CreatePdfUtil {
 
         for (ExamStudentCourseDto e : examStudentList) {
             char[] chars = e.getSiteNumber().toLowerCase().toCharArray();
-            int ascii = 0;
+            String ascii = "";
             for (int i = 0; i < chars.length; i++) {
                 ascii = ascii + chars[i];
-                e.setAscii(ascii);
             }
+            e.setAscii(ascii);
         }
 
         Optional<ExamStudentCourseDto> minSite = null;
         Optional<ExamStudentCourseDto> maxSite = null;
         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(""));