工作量查询返回值按科目

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

@@ -10,7 +10,13 @@ public class ScannerWorkloadVo {
     @ExcelColumn(name = "设备名称", index = 1)
     private String deviceName;
 
-    @ExcelColumn(name = "数量", index = 2)
+    @ExcelColumn(name = "科目代码", index = 3)
+    private String subjectCode;
+
+    @ExcelColumn(name = "科目名称", index = 4)
+    private String subjectName;
+
+    @ExcelColumn(name = "数量", index = 5)
     private Integer answerScanCount;
 
     public String getDevice() {
@@ -36,4 +42,20 @@ public class ScannerWorkloadVo {
     public void setDeviceName(String deviceName) {
         this.deviceName = deviceName;
     }
+
+    public String getSubjectCode() {
+        return subjectCode;
+    }
+
+    public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
 }

src/main/resources/mapper/BatchMapper.xml

@@ -29,11 +29,14 @@
         select tem.* from(SELECT
         b.device,
         s.device_name,
+        b.subject_code,
+        su.name subjectName,
         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
+        left join sc_subject su on b.subject_code = su.`code` and b.exam_id=su.exam_id
         where
         b.exam_id=#{req.examId}
         <if test="req.startTime != null">
@@ -42,7 +45,7 @@
         <if test="req.endTime != null">
             AND b.create_time &lt;= #{req.endTime}
         </if>
-        GROUP BY b.device) tem
+        GROUP BY b.device,b.subject_code ) tem
         <if test="req.sort != null">
         	<if test="req.sort = 'ASC'">
         		order by tem.answerScanCount ASC