fix

src/main/java/cn/com/qmth/scancentral/vo/assginedcheck/AssignedCheckExamRoomExport.java

@@ -14,12 +14,15 @@ public class AssignedCheckExamRoomExport {
     @ExcelColumn(name = "考点", index = 2)
     private String examSite;
 
-    @ExcelColumn(name = "校区", index = 3)
-    private String campusCode;
+    @ExcelColumn(name = "考点名称", index = 3)
+    private String examSiteName;
 
     @ExcelColumn(name = "校区", index = 4)
+    private String campusCode;
+
+    @ExcelColumn(name = "校区", index = 5)
     private String campusName;
-    @ExcelColumn(name = "考场", index = 5)
+    @ExcelColumn(name = "考场", index = 6)
     private String examRoom;
 
     public String getSubjectCode() {
@@ -38,6 +41,14 @@ public class AssignedCheckExamRoomExport {
         this.examSite = examSite;
     }
 
+    public String getExamSiteName() {
+        return examSiteName;
+    }
+
+    public void setExamSiteName(String examSiteName) {
+        this.examSiteName = examSiteName;
+    }
+
     public String getCampusCode() {
         return campusCode;
     }

src/main/java/cn/com/qmth/scancentral/vo/student/StudentExamRoomVo.java

@@ -10,13 +10,15 @@ public class StudentExamRoomVo {
     @ExcelColumn(name = "科目名称", index = 1)
     private String subjectName;
 
-    @ExcelColumn(name = "校区", index = 3)
-    private String campusCode;
-
     @ExcelColumn(name = "考点", index = 2)
     private String examSite;
 
-    @ExcelColumn(name = "考场号", index = 4)
+    @ExcelColumn(name = "考点名称", index = 3)
+    private String examSiteName;
+    @ExcelColumn(name = "校区", index = 4)
+    private String campusCode;
+
+    @ExcelColumn(name = "考场号", index = 5)
     private String examRoom;
 
     public String getSubjectCode() {
@@ -59,4 +61,11 @@ public class StudentExamRoomVo {
         this.examRoom = examRoom;
     }
 
+    public String getExamSiteName() {
+        return examSiteName;
+    }
+
+    public void setExamSiteName(String examSiteName) {
+        this.examSiteName = examSiteName;
+    }
 }

src/main/java/cn/com/qmth/scancentral/vo/student/StudentVo.java

@@ -25,15 +25,16 @@ public class StudentVo {
 
     private String campusName;
 
-    @ExcelColumn(name = "校区", index = 5)
+    @ExcelColumn(name = "校区", index = 6)
     private String campusCode;
 
     @ExcelColumn(name = "考点", index = 4)
     private String examSite;
 
+    @ExcelColumn(name = "考点名称", index = 5)
     private String examSiteName;
 
-    @ExcelColumn(name = "考场号", index = 6)
+    @ExcelColumn(name = "考场号", index = 7)
     private String examRoom;
 
     private String seatNumber;

src/main/resources/mapper/StudentMapper.xml

@@ -721,7 +721,7 @@
     </select>
     <select id="studentExamRoomExport"
             resultType="cn.com.qmth.scancentral.vo.student.StudentExamRoomVo">
-        select tm.* from (select t.campus_code,t.exam_site,t.exam_room,
+        select tm.* from (select t.campus_code,t.exam_site,t.exam_site_name,t.exam_room,
         s.code subject_code,
         s.name subject_name
         from sc_student t
@@ -783,6 +783,7 @@
                stu.campus_code,
                stu.campus_name,
                stu.exam_site,
+               stu.exam_site_name,
                stu.exam_room
         from sc_student stu
                  left join sc_subject sb on sb.exam_id = stu.exam_id and sb.code = stu.subject_code