Browse Source

监考日志修改

wangliang 4 years ago
parent
commit
4991fbc37f

+ 9 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamCourseDto.java

@@ -13,6 +13,7 @@ import java.util.Date;
 public class TEExamCourseDto implements Serializable {
 public class TEExamCourseDto implements Serializable {
 
 
     private Long id;//id
     private Long id;//id
+    private Long examId;//考试id
     private String courseCode;//科目代码
     private String courseCode;//科目代码
     private String courseName;//科目名称
     private String courseName;//科目名称
     private Integer objectiveShuffle;//是否开启客观题乱序,0:不开启,1:开启
     private Integer objectiveShuffle;//是否开启客观题乱序,0:不开启,1:开启
@@ -25,6 +26,14 @@ public class TEExamCourseDto implements Serializable {
     private Date updateTime;//更新时间
     private Date updateTime;//更新时间
     private String updateName;//更新人
     private String updateName;//更新人
 
 
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
     public Date getUpdateTime() {
     public Date getUpdateTime() {
         return updateTime;
         return updateTime;
     }
     }

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

@@ -6,6 +6,7 @@
 	<select id="examCourseQuery" resultType="com.qmth.themis.business.dto.response.TEExamCourseDto">
 	<select id="examCourseQuery" resultType="com.qmth.themis.business.dto.response.TEExamCourseDto">
 		select
 		select
 		t.id,
 		t.id,
+		t.examId,
 		t.courseCode,
 		t.courseCode,
 		t.courseName,
 		t.courseName,
 		t.paperCount,
 		t.paperCount,
@@ -20,7 +21,7 @@
 		from
 		from
 		(
 		(
 		select
 		select
-		teec.id,teec.course_code as courseCode, teec.course_name as courseName, teec.paper_count as paperCount,
+		teec.exam_id as examId,teec.id,teec.course_code as courseCode, teec.course_name as courseName, teec.paper_count as paperCount,
 		if(teec.paper_count > 0, 1, 0) as hasPaper, teec.objective_shuffle as objectiveShuffle, teec.option_shuffle as
 		if(teec.paper_count > 0, 1, 0) as hasPaper, teec.objective_shuffle as objectiveShuffle, teec.option_shuffle as
 		optionShuffle, teec.audio_play_count as audioPlayCount, teec.has_answer as hasAnswer, teec.has_audio as
 		optionShuffle, teec.audio_play_count as audioPlayCount, teec.has_answer as hasAnswer, teec.has_audio as
 		hasAudio, teec.create_time as createTime, teec.update_time as updateTime, (
 		hasAudio, teec.create_time as createTime, teec.update_time as updateTime, (