广州美术阅卷

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/dto/PaperExpDTO.java

@@ -10,9 +10,10 @@ public class PaperExpDTO {
     public PaperExpDTO() {
     }
 
-    public PaperExpDTO(String studentName, String examNumber) {
+    public PaperExpDTO(String studentName, String examNumber, String subject) {
         this.studentName = studentName;
         this.examNumber = examNumber;
+        this.subject = subject;
     }
 
     @ExcelProperty(name = "姓名", index = 0, type = 1)
@@ -21,6 +22,8 @@ public class PaperExpDTO {
     @ExcelProperty(name = "准考证号", index = 1, type = 1)
     private String examNumber;
 
+    @ExcelProperty(name = "科目", index = 2, type = 1)
+    private String subject;
 
     public String getStudentName() {
         return studentName;
@@ -37,4 +40,12 @@ public class PaperExpDTO {
     public void setExamNumber(String examNumber) {
         this.examNumber = examNumber;
     }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
 }

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/exporter/PaperExporter.java

@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Created by yuanpan on 2017/12/23.
@@ -41,11 +42,11 @@ public class PaperExporter {
             File file = new File(filePath);
             if (!file.exists()) {
 
-                expPapers.add(new PaperExpDTO(paper.getStudentName(), paper.getExamNumber()));
+                expPapers.add(new PaperExpDTO(paper.getStudentName(), paper.getExamNumber(), paper.getSubject().getName()));
             }
 
         }
 
-        ExportUtils.exportEXCEL("试卷", PaperExpDTO.class, expPapers, response);
+        ExportUtils.exportEXCEL("错误试卷", PaperExpDTO.class, expPapers.stream().sorted((p1, p2) -> p1.getExamNumber().compareTo(p2.getExamNumber())).collect(Collectors.toList()), response);
     }
 }

stmms-ms-main/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=gz
+spring.profiles.active=dev
 
 spring.datasource.url=jdbc:mysql://localhost:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
 spring.datasource.username=root