扫描员工作量新增设备名称

src/main/java/cn/com/qmth/scancentral/vo/ScannerWorkloadVo.java

@@ -4,9 +4,12 @@ import com.qmth.boot.tools.excel.annotation.ExcelColumn;
 
 public class ScannerWorkloadVo {
 
-    @ExcelColumn(name = "IP", index = 0)
+    @ExcelColumn(name = "设备标识", index = 0)
     private String device;
 
+    @ExcelColumn(name = "设备名称", index = 0)
+    private String deviceName;
+
     @ExcelColumn(name = "数量", index = 1)
     private Integer answerScanCount;
 
@@ -26,4 +29,11 @@ public class ScannerWorkloadVo {
         this.answerScanCount = answerScanCount;
     }
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
 }

src/main/resources/mapper/BatchMapper.xml

@@ -28,10 +28,12 @@
             resultType="cn.com.qmth.scancentral.vo.ScannerWorkloadVo">
         SELECT
         b.device,
+        s.device_name,
         count(DISTINCT bp.student_id) answerScanCount
         FROM
         sc_batch b
         left join sc_batch_paper bp on b.id=bp.batch_id
+        left join sc_scanner s on b.device=s.device
         where
         b.exam_id=#{examId}
         <if test="startTime != null">
@@ -230,7 +232,7 @@
     <select id="subjectList"
             resultType="cn.com.qmth.scancentral.vo.SubjectVo">
         select distinct b.subject_code,s.name subjectName
-        from sc_batch b 
+        from sc_batch b
         left join sc_subject s on b.exam_id=s.exam_id and b.subject_code=s.code
         where b.exam_id = #{req.examId}
         <if test="req.startTime != null">
@@ -244,7 +246,7 @@
     <select id="deviceList"
             resultType="cn.com.qmth.scancentral.vo.device.DeviceVo">
         select distinct b.device,d.device_name
-        from sc_batch b 
+        from sc_batch b
         left join sc_scanner d on b.device=d.device
         where b.exam_id = #{req.examId}
         and b.subject_code=#{req.subjectCode}
@@ -259,7 +261,7 @@
     <select id="batchList"
             resultType="cn.com.qmth.scancentral.vo.batch.BatchVo">
         select distinct b.id batchId,b.create_time
-        from sc_batch b 
+        from sc_batch b
         where b.exam_id = #{req.examId}
         and b.subject_code=#{req.subjectCode}
         and b.device=#{req.device}
@@ -270,13 +272,13 @@
             and b.create_time&lt;=#{req.endTime}
         </if>
         order by b.create_time
-    </select> 
+    </select>
     <select id="studentList"
             resultType="cn.com.qmth.scancentral.vo.batch.BatchStudentSimpleVo">
-        select s.id studentId,s.name studentName,s.exam_number
-        from sc_batch_paper b 
-        left join sc_student s on b.student_id=s.id
+        select s.id studentId, s.name studentName, s.exam_number
+        from sc_batch_paper b
+                 left join sc_student s on b.student_id = s.id
         where b.batch_id = #{batchId}
         order by s.exam_number
-    </select>      
+    </select>
 </mapper>