wangliang пре 4 година
родитељ
комит
c413bd1fc5

+ 5 - 5
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamStudentDto.java

@@ -23,7 +23,7 @@ public class TEExamStudentDto implements Serializable {
     private String roomName;//考场名称
     private String grade;//年级
     private String classNo;//教学班级
-    private Long activityId;//场次id
+    private Long examActivityId;//场次id
     private String activityCode;//场次代码
     private Long examId;//考试批次id
 
@@ -35,12 +35,12 @@ public class TEExamStudentDto implements Serializable {
         this.examId = examId;
     }
 
-    public Long getActivityId() {
-        return activityId;
+    public Long getExamActivityId() {
+        return examActivityId;
     }
 
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
+    public void setExamActivityId(Long examActivityId) {
+        this.examActivityId = examActivityId;
     }
 
     public String getActivityCode() {

+ 1 - 1
themis-business/src/main/resources/mapper/TEExamStudentMapper.xml

@@ -17,7 +17,7 @@
             tees.room_name as roomName,
             tees.grade,
             tees.class_no as classNo,
-            teea.id as activityId,
+            teea.id as examActivityId,
             teea.code as activityCode
         from
             t_e_exam_student tees