座位号bug修改

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

@@ -28,17 +28,6 @@ public class ExamStudentCourseDto extends ExamStudent {
     @ApiModelProperty("试卷编号")
     private String paperNumber;
 
-    @ApiModelProperty("排序用")
-    String ascii;
-
-    public String getAscii() {
-        return ascii;
-    }
-
-    public void setAscii(String ascii) {
-        this.ascii = ascii;
-    }
-
     public String getPaperNumber() {
         return paperNumber;
     }

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

@@ -170,16 +170,16 @@ public class CreatePdfUtil {
         Optional<ExamStudentCourseDto> maxSite = null;
         List<ExamStudentCourseDto> tempList = examStudentList.stream().filter(s -> (Objects.nonNull(s.getSiteNumber()) && !Objects.equals("", s.getSiteNumber().trim()))).collect(Collectors.toList());
         if (Objects.nonNull(tempList) && tempList.size() > 0) {
-            for (ExamStudentCourseDto e : tempList) {
-                char[] chars = e.getSiteNumber().toLowerCase().toCharArray();
-                String ascii = "";
-                for (int i = 0; i < chars.length; i++) {
-                    ascii = ascii + chars[i];
-                }
-                e.setAscii(ascii);
-            }
-            minSite = tempList.stream().min(Comparator.comparing(s -> Integer.parseInt(s.getAscii())));
-            maxSite = tempList.stream().max(Comparator.comparing(s -> Integer.parseInt(s.getAscii())));
+//            for (ExamStudentCourseDto e : tempList) {
+//                char[] chars = e.getSiteNumber().toLowerCase().toCharArray();
+//                String ascii = "";
+//                for (int i = 0; i < chars.length; i++) {
+//                    ascii = ascii + chars[i];
+//                }
+//                e.setAscii(ascii.hashCode());
+//            }
+            minSite = tempList.stream().min(Comparator.comparing(s -> s.getSiteNumber().hashCode()));
+            maxSite = tempList.stream().max(Comparator.comparing(s -> s.getSiteNumber().hashCode()));
         }
 
         htmlMap.put("minSite", Optional.ofNullable(minSite).map(s -> s.get().getSiteNumber()).orElse(""));
@@ -326,6 +326,7 @@ public class CreatePdfUtil {
 
     /**
      * 替换自定义题卡参数
+     *
      * @param examCardDetail
      * @return
      * @throws IOException