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

@@ -166,20 +166,20 @@ public class CreatePdfUtil {
 //            maxSite = tempList.stream().max((a, b) -> a.getSiteNumber().compareTo(b.getSiteNumber())).get().getSiteNumber();
 //        }
 
-        for (ExamStudentCourseDto e : examStudentList) {
-            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 -> Integer.parseInt(s.getAscii())));
-            maxSite = examStudentList.stream().max(Comparator.comparing(s -> Integer.parseInt(s.getAscii())));
+        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())));
         }
 
         htmlMap.put("minSite", Optional.ofNullable(minSite).map(s -> s.get().getSiteNumber()).orElse(""));

distributed-print-business/src/main/resources/mapper/ExamDetailMapper.xml

@@ -69,6 +69,9 @@
                 LEFT JOIN
             sys_user d on a.create_id = d.id
             <where>
+                <if test="schoolId != null and schoolId != ''">
+                    and a.school_id = #{schoolId}
+                </if>
                 <if test="printPlanId != null and printPlanId != ''">
                     and a.id = #{printPlanId}
                 </if>