add. 审批记录下载报错更改

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/document/ArchivePaperVo.java

@@ -2,6 +2,7 @@ package com.qmth.teachcloud.mark.bean.document;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
 
 public class ArchivePaperVo {
 
@@ -12,6 +13,10 @@ public class ArchivePaperVo {
 	private String openCollege;
 	private String paperNumber;
 
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty("命题任务id")
+	private Long examTaskId;
+
 	public Long getExamId() {
 		return examId;
 	}
@@ -52,4 +57,11 @@ public class ArchivePaperVo {
 		this.paperNumber = paperNumber;
 	}
 
+	public Long getExamTaskId() {
+		return examTaskId;
+	}
+
+	public void setExamTaskId(Long examTaskId) {
+		this.examTaskId = examTaskId;
+	}
 }

teachcloud-mark/src/main/resources/mapper/MarkPaperMapper.xml

@@ -275,11 +275,12 @@
     </select>
 
     <select id="documentList" resultType="com.qmth.teachcloud.mark.bean.document.ArchivePaperVo">
-        SELECT t.id,t.exam_id,bc.code courseCode,bc.name courseName, so.name openCollege,t.paper_number
+        SELECT t.id,t.exam_id,bc.code courseCode,bc.name courseName, so.name openCollege,t.paper_number,et.id AS examTaskId
         FROM
         mark_paper t
             left join basic_course bc on t.course_id = bc.id
             left join sys_org so on bc.teaching_room_id = so.id
+            left join exam_task et on t.exam_id = et.exam_id and t.paper_number = et.paper_number
         WHERE
         t.exam_id = #{req.examId}
         <if test="req.openCollegeId != null">