xiatian 8 mesi fa
parent
commit
863c5520d6

+ 3 - 1
src/main/java/cn/com/qmth/scancentral/vo/student/StudentPageVo.java

@@ -43,9 +43,11 @@ public class StudentPageVo {
     @ExcelColumn(name = "扫描状态", index = 8)
     private String scanned;
 
-    @ExcelColumn(name = "设备", index = 9)
     private String device;
 
+    @ExcelColumn(name = "设备名", index = 9)
+    private String deviceName;
+
     public Long getId() {
         return id;
     }

+ 2 - 1
src/main/resources/mapper/StudentMapper.xml

@@ -660,8 +660,9 @@
         order by tm.subject_code,tm.subjectName,tm.campus_code,tm.exam_site,tm.exam_room
     </select>
     <select id="studentPage" resultType="cn.com.qmth.scancentral.vo.student.StudentPageVo">
-        select t.*
+        select t.*,ss.device_name
         from sc_student t
+        left join sc_scanner ss on t.device=ss.device
         where t.exam_id=#{req.examId}
         <if test="req.campusCode != null and req.campusCode !=''">
             and t.campus_code=#{req.campusCode}