3.3.0 fix

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/scanpackage/ScanPackageQuery.java

@@ -6,35 +6,43 @@ import com.qmth.teachcloud.common.enums.ScanStatus;
 import com.qmth.teachcloud.mark.utils.PagerQuery;
 
 public class ScanPackageQuery extends PagerQuery {
-	@NotNull(message = "考试Id不能为空")
-	private Long examId;
-	@NotNull(message = "coursePaperId不能为空")
-	private String coursePaperId;
-	
-	private ScanStatus status;
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public String getCoursePaperId() {
-		return coursePaperId;
-	}
-
-	public void setCoursePaperId(String coursePaperId) {
-		this.coursePaperId = coursePaperId;
-	}
-
-	public ScanStatus getStatus() {
-		return status;
-	}
-
-	public void setStatus(ScanStatus status) {
-		this.status = status;
-	}
+    @NotNull(message = "考试Id不能为空")
+    private Long examId;
+    private String courseCode;
+    private String coursePaperId;
+
+    private ScanStatus status;
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCoursePaperId() {
+        return coursePaperId;
+    }
+
+    public void setCoursePaperId(String coursePaperId) {
+        this.coursePaperId = coursePaperId;
+    }
+
+    public ScanStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(ScanStatus status) {
+        this.status = status;
+    }
 
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanPackageServiceImpl.java

@@ -132,8 +132,7 @@ public class ScanPackageServiceImpl extends ServiceImpl<ScanPackageMapper, ScanP
 
 	@Override
 	public IPage<ScanPackageVo> imagePage(ScanPackageQuery query) {
-		IPage<ScanPackageVo> iPage = this.baseMapper.page(new Page<>(query.getPageNumber(), query.getPageSize()),
-				query);
+		IPage<ScanPackageVo> iPage = this.baseMapper.page(new Page<>(query.getPageNumber(), query.getPageSize()), query);
 		if(CollectionUtils.isNotEmpty(iPage.getRecords())) {
 			List<ScanPackage> sps=getByExamIdAndCoursePaperId(query.getExamId(), query.getCoursePaperId());
 			if(CollectionUtils.isNotEmpty(sps)) {

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

@@ -23,7 +23,13 @@
 		resultType="com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageVo">
 		select t.*,t.paper_number coursePaperNumber
 		FROM mark_paper t
-        where t.exam_id=#{req.examId} and t.course_paper_id=#{req.coursePaperId}
+        where t.exam_id=#{req.examId}
+        <if test="req.courseCode != null and req.courseCode != ''">
+			and t.course_code = #{req.courseCode}
+		</if>
+		<if test="req.req.coursePaperId != null and req.req.coursePaperId != ''">
+			and t.course_paper_id= #{req.coursePaperId}
+		</if>
         <if test="req.status != null">
 			<if test="req.status ==@com.qmth.teachcloud.common.enums@SCANNED">
 				and exists (