xiatian 8 meses atrás
pai
commit
576c053e51

+ 10 - 0
src/main/java/cn/com/qmth/markingaudit/bean/ExamDataVo.java

@@ -22,6 +22,8 @@ public class ExamDataVo {
 
     private Integer id;
 
+    private Integer dataId;
+
     public String getName() {
         return name;
     }
@@ -102,4 +104,12 @@ public class ExamDataVo {
         this.sasConfig = sasConfig;
     }
 
+    public Integer getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(Integer dataId) {
+        this.dataId = dataId;
+    }
+
 }

+ 5 - 5
src/main/java/cn/com/qmth/markingaudit/bean/StudentDataVo.java

@@ -2,7 +2,7 @@ package cn.com.qmth.markingaudit.bean;
 
 public class StudentDataVo {
 
-    private Integer id;
+    private Integer dataId;
 
     // 准考证号
     private String cardNo;
@@ -48,12 +48,12 @@ public class StudentDataVo {
         this.status = status;
     }
 
-    public Integer getId() {
-        return id;
+    public Integer getDataId() {
+        return dataId;
     }
 
-    public void setId(Integer id) {
-        this.id = id;
+    public void setDataId(Integer dataId) {
+        this.dataId = dataId;
     }
 
 }

+ 4 - 2
src/main/resources/mapper/MonitorMapper.xml

@@ -9,7 +9,9 @@
 		and t.id=#{examId}
 	</select>
 	<select id="examData" resultType="cn.com.qmth.markingaudit.bean.ExamDataVo">
-		select t.id,t.name,t.type kind,t.exam_time,t.mark_start_time start_time,t.mark_end_time end_time,t.create_time,t.sas_config
+		select t.id,t.name,t.type kind,t.exam_time,t.mark_start_time start_time
+		,t.mark_end_time end_time,t.create_time,t.sas_config,
+		t.id dataId
 		from eb_exam t 
 		left join b_school s on t.school_id=s.id
 		where s.code=#{req.schoolCode}
@@ -19,7 +21,7 @@
 	</select>
 	
 	<select id="studentData" resultType="cn.com.qmth.markingaudit.bean.StudentDataVo">
-		select t.id,t.name,t.exam_number cardNo,t.student_code studentId,
+		select t.id dataId,t.name,t.exam_number cardNo,t.student_code studentId,
 		(case when t.is_absent=0 and t.is_upload=1 then 1 else 0 end) status
 		from eb_exam_student t 
 		where t.exam_id=#{req.examId}