报表场次id修改为场次代码

themis-business/src/main/java/com/qmth/themis/business/bean/admin/ExamBreachListBean.java

@@ -22,6 +22,9 @@ public class ExamBreachListBean {
     @ApiModelProperty(name = "场次id")
     private Long examActivityId;
 
+	@ApiModelProperty(name = "场次代码")
+	private String examActivityCode;
+
     @ApiModelProperty(name = "虚拟考场代码")
     private String roomCode;
 
@@ -43,6 +46,14 @@ public class ExamBreachListBean {
     @ApiModelProperty(name = "违纪状态")
     private String breachStatus;
 
+	public String getExamActivityCode() {
+		return examActivityCode;
+	}
+
+	public void setExamActivityCode(String examActivityCode) {
+		this.examActivityCode = examActivityCode;
+	}
+
 	public String getExamStudentId() {
 		return examStudentId;
 	}

themis-business/src/main/java/com/qmth/themis/business/bean/admin/ExamDeficiencyListBean.java

@@ -27,6 +27,9 @@ public class ExamDeficiencyListBean implements Serializable {
     @ApiModelProperty(name = "场次id")
     private Long examActivityId;
 
+	@ApiModelProperty(name = "场次代码")
+	private String examActivityCode;
+
     @ApiModelProperty(name = "虚拟考场代码")
     private String roomCode;
 
@@ -45,6 +48,18 @@ public class ExamDeficiencyListBean implements Serializable {
     @ApiModelProperty(name = "科目编码")
     private String courseName;
 
+	public static long getSerialVersionUID() {
+		return serialVersionUID;
+	}
+
+	public String getExamActivityCode() {
+		return examActivityCode;
+	}
+
+	public void setExamActivityCode(String examActivityCode) {
+		this.examActivityCode = examActivityCode;
+	}
+
 	public String getExamName() {
 		return examName;
 	}

themis-business/src/main/java/com/qmth/themis/business/bean/admin/ExamExceptionListBean.java

@@ -28,6 +28,9 @@ public class ExamExceptionListBean implements Serializable {
     @ApiModelProperty(name = "场次id")
     private Long examActivityId;
 
+	@ApiModelProperty(name = "场次代码")
+	private String examActivityCode;
+
     @ApiModelProperty(name = "虚拟考场代码")
     private String roomCode;
 
@@ -52,6 +55,18 @@ public class ExamExceptionListBean implements Serializable {
     @ApiModelProperty(name = "累计持续时长")
     private Long exceptionTotalTime;
 
+	public static long getSerialVersionUID() {
+		return serialVersionUID;
+	}
+
+	public String getExamActivityCode() {
+		return examActivityCode;
+	}
+
+	public void setExamActivityCode(String examActivityCode) {
+		this.examActivityCode = examActivityCode;
+	}
+
 	public String getExamName() {
 		return examName;
 	}

themis-business/src/main/java/com/qmth/themis/business/bean/admin/ExamReexamListBean.java

@@ -22,6 +22,9 @@ public class ExamReexamListBean{
     @ApiModelProperty(name = "场次id")
     private Long examActivityId;
 
+	@ApiModelProperty(name = "场次代码")
+	private String examActivityCode;
+
     @ApiModelProperty(name = "虚拟考场代码")
     private String roomCode;
 
@@ -39,7 +42,15 @@ public class ExamReexamListBean{
     
     @ApiModelProperty(name = "科目编码")
     private String courseName;
-    
+
+	public String getExamActivityCode() {
+		return examActivityCode;
+	}
+
+	public void setExamActivityCode(String examActivityCode) {
+		this.examActivityCode = examActivityCode;
+	}
+
 	public String getExamName() {
 		return examName;
 	}

themis-business/src/main/java/com/qmth/themis/business/bean/admin/ExamStudentLogListBean.java

@@ -22,6 +22,9 @@ public class ExamStudentLogListBean {
     @ApiModelProperty(name = "场次id")
     private Long examActivityId;
 
+	@ApiModelProperty(name = "场次代码")
+	private String examActivityCode;
+
     @ApiModelProperty(name = "虚拟考场代码")
     private String roomCode;
 
@@ -40,6 +43,14 @@ public class ExamStudentLogListBean {
     @ApiModelProperty(name = "科目编码")
     private String courseName;
 
+	public String getExamActivityCode() {
+		return examActivityCode;
+	}
+
+	public void setExamActivityCode(String examActivityCode) {
+		this.examActivityCode = examActivityCode;
+	}
+
 	public String getExamStudentId() {
 		return examStudentId;
 	}

themis-business/src/main/java/com/qmth/themis/business/bean/admin/ExamViewCountListBean.java

@@ -26,6 +26,9 @@ public class ExamViewCountListBean implements Serializable {
     @ApiModelProperty(name = "场次id")
     private Long examActivityId;
 
+	@ApiModelProperty(name = "场次代码")
+	private String examActivityCode;
+
     @ApiModelProperty(name = "虚拟考场代码")
     private String roomCode;
 
@@ -41,6 +44,18 @@ public class ExamViewCountListBean implements Serializable {
     @ApiModelProperty(name = "缺考")
     private Long deficiencyExamTotal;
 
+	public static long getSerialVersionUID() {
+		return serialVersionUID;
+	}
+
+	public String getExamActivityCode() {
+		return examActivityCode;
+	}
+
+	public void setExamActivityCode(String examActivityCode) {
+		this.examActivityCode = examActivityCode;
+	}
+
 	public String getExamName() {
 		return examName;
 	}

themis-business/src/main/resources/mapper/TEExamBreachLogMapper.xml

@@ -15,12 +15,14 @@
 		t.NAME,
 		t.identity,
 		t.room_name
-		roomName,'违纪' breachStatus
+		roomName,'违纪' breachStatus,
+		teea.code as examActivityCode
 		FROM
 		t_e_exam_breach_log f
 		LEFT JOIN
 		t_e_exam_student t ON f.exam_student_id = t.id
 		left join t_e_student h on t.student_id=h.id
+		left join t_e_exam_activity teea on teea.id = t.exam_activity_id
 		where f.exam_id=#{examId} and f.status=0
 		<if test="orgId != null">
 		 	and h.org_id=#{orgId}
@@ -55,12 +57,14 @@
 		t.NAME,
 		t.identity,
 		t.room_name
-		roomName,'正常' breachStatus
+		roomName,'正常' breachStatus,
+		teea.code as examActivityCode
 		FROM
 		t_e_exam_breach_log f
 		LEFT JOIN
 		t_e_exam_student t ON f.exam_student_id = t.id
 		left join t_e_student h on t.student_id=h.id
+		left join t_e_exam_activity teea on teea.id = t.exam_activity_id
 		where f.exam_id=#{examId} and f.status=1
 		<if test="orgId != null">
 		 	and h.org_id=#{orgId}

themis-business/src/main/resources/mapper/TEExamReexamMapper.xml

@@ -240,11 +240,13 @@
 		t.course_name courseName,
 		t.NAME,
 		t.identity,
-		t.room_name roomName
+		t.room_name roomName,
+		teea.code as examActivityCode
 		FROM
 		t_e_exam_reexam f
 		LEFT JOIN t_e_exam_student t ON f.exam_student_id = t.id
 		left join t_e_student h on t.student_id=h.id
+		left join t_e_exam_activity teea on teea.id = t.exam_activity_id
 		where f.exam_id =#{examId}
 		<if test="orgId != null">
 		 	and h.org_id=#{orgId}

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

@@ -155,8 +155,9 @@
 	<select id="getTotalCountInfo"
 		resultType="com.qmth.themis.business.bean.admin.ExamViewCountListBean">
 		select t.exam_id examId,t.exam_activity_id examActivityId,t.room_code
-		roomCode,t.room_name roomName, count(1) examTotal from
+		roomCode,t.room_name roomName, count(1) examTotal,teea.code as examActivityCode from
 		t_e_exam_student t left join t_e_student h on t.student_id=h.id
+		left join t_e_exam_activity teea on teea.id = t.exam_activity_id
 		where t.exam_id = #{examId}
 		<if test="orgId != null">
 		 	and h.org_id=#{orgId}
@@ -224,7 +225,7 @@
 		examActivityId,t.room_code
 		roomCode,t.course_code courseCode,t.course_name
 		courseName,t.name,t.identity
-		,t.room_name roomName from
+		,t.room_name roomName,f.code as examActivityCode from
 		t_e_exam_student t
 		left join t_e_exam_activity f on
 		t.exam_activity_id=f.id
@@ -258,9 +259,10 @@
 		examActivityId,t.room_code
 		roomCode,t.course_code courseCode,t.course_name
 		courseName,t.name,t.identity
-		,t.room_name roomName from
+		,t.room_name roomName,teea.code as examActivityCode from
 		t_e_exam_student t
 		left join t_e_student h on t.student_id=h.id
+		left join t_e_exam_activity teea on teea.id = t.exam_activity_id
 		where t.exam_id = #{examId} 
 		<if test="orgId != null">
 		 	and h.org_id=#{orgId}

themis-business/src/main/resources/mapper/TIeInvigilateExceptionInfoMapper.xml

@@ -15,11 +15,13 @@
 		t.identity,
 		t.room_name roomName,
 		count(f.exam_student_id) exceptionCount,
-		sum(f.difference) exceptionTotalTime
+		sum(f.difference) exceptionTotalTime,
+		teea.code as examActivityCode
 		FROM
 		t_ie_invigilate_exception_info f
 		LEFT JOIN t_e_exam_student t ON f.exam_student_id = t.id
 		left join t_e_student h on t.student_id=h.id
+		left join t_e_exam_activity teea on teea.id = t.exam_activity_id
 		where f.exam_id =#{examId}
 		<if test="orgId != null">
 		 	and h.org_id=#{orgId}