caozixuan 2 anos atrás
pai
commit
77dcbebc0e

+ 9 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/open/ExamStudentScore.java

@@ -5,6 +5,7 @@ import java.util.List;
 public class ExamStudentScore {
 
     private String name;
+    private String examNumber;
     private String studentCode;
     private String paperNumber;
     private String paperName;
@@ -29,6 +30,14 @@ public class ExamStudentScore {
         this.name = name;
     }
 
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
     public String getStudentCode() {
         return studentCode;
     }

+ 1 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/OpenApiServiceImpl.java

@@ -193,6 +193,7 @@ public class OpenApiServiceImpl implements OpenApiService {
             } else {
                 examStudentScore.setName(m.getName());
                 examStudentScore.setStudentCode(m.getStudentCode());
+                examStudentScore.setExamNumber(m.getExamNumber());
                 examStudentScore.setPaperNumber(gradeBatchPaper.getPaperNumber());
                 examStudentScore.setPaperName(m.getSubjectName());
                 examStudentScore.setPaperType(gradeBatchPaper.getPaperType());

+ 9 - 0
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/printOpen/ExamStudentScore.java

@@ -11,6 +11,7 @@ import java.util.List;
 public class ExamStudentScore {
     private String name;
     private String studentCode;
+    private String examNumber;
     private String paperNumber;
     private String paperName;
     private String paperType;
@@ -42,6 +43,14 @@ public class ExamStudentScore {
         this.studentCode = studentCode;
     }
 
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
     public String getPaperNumber() {
         return paperNumber;
     }

+ 2 - 1
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/AnalyzeDataGetAndEditServiceImpl.java

@@ -610,6 +610,7 @@ public class AnalyzeDataGetAndEditServiceImpl implements AnalyzeDataGetAndEditSe
         Map<String, TBStudent> checkMap = new HashMap<>();
         for (ExamStudentScore examStudentScore : examStudentScoreList) {
             String studentCode = examStudentScore.getStudentCode(); //学号
+            String ticketNumber = examStudentScore.getExamNumber();// 准考证号
             String name = examStudentScore.getName(); //名称
             String paperType = examStudentScore.getPaperType(); //试卷类型
             // 循环依次为#生成(分配)试卷编号为A、B、C......A、B、C......
@@ -700,7 +701,7 @@ public class AnalyzeDataGetAndEditServiceImpl implements AnalyzeDataGetAndEditSe
             } else {
                 tbExamStudent.setTeacherId(0L);
             }
-            tbExamStudent.setTicketNumber(studentCode);
+            tbExamStudent.setTicketNumber(ticketNumber);
             tbExamStudent.setAbsent(status == 2 || status == 3);
             // 全部设置为本届
             tbExamStudent.setStudentCurrent(true);