bug:分析批次课程管理拉出命题教师

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

@@ -27,6 +27,7 @@
         gbp.id AS id,
         bs.name AS semesterName,
         be.name AS examName,
+        su.real_name AS teacherName,
         et.course_code AS courseCode,
         et.course_name AS courseName,
         et.teaching_room_id AS teachingRoomId,
@@ -46,6 +47,8 @@
         LEFT JOIN
         basic_semester bs ON be.school_id = bs.school_id
         AND be.semester_id = bs.id
+        LEFT JOIN
+        sys_user su ON et.user_id = su.id
         <where>
             AND gbp.enable = true
             <if test="schoolId != null and schoolId != ''">

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/PageSizeEnum.java

@@ -101,8 +101,11 @@ public enum PageSizeEnum {
      * @return
      */
     public static PageSizeEnum convertToEnum(float width, float height) {
-        float deviation = SystemConstant.PAPER_DEVIATION;
         for (PageSizeEnum e : PageSizeEnum.values()) {
+            float deviation = SystemConstant.PAPER_DEVIATION;
+            if (PageSizeEnum.A3.equals(e)){
+                deviation = 2 * SystemConstant.PAPER_DEVIATION;
+            }
             float standardWidth = e.getWidth();
             float standardHeight = e.getHeight();
             if (standardWidth - deviation <= width && width <= standardWidth + deviation && standardHeight - deviation <= height && height <= standardHeight + deviation){