3.3.0 fix

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkerTrackDTO.java

@@ -11,6 +11,7 @@ public class MarkerTrackDTO extends TrackDTO {
 
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
+    private Boolean headerMarkScore;
 
     public MarkerTrackDTO(MarkTrack track) {
         super(track);
@@ -20,6 +21,7 @@ public class MarkerTrackDTO extends TrackDTO {
     public MarkerTrackDTO(MarkHeaderTrack markHeaderTrack) {
         super(markHeaderTrack);
         this.userId = markHeaderTrack.getUserId();
+        this.headerMarkScore = true;
     }
 
     public Long getUserId() {
@@ -29,4 +31,12 @@ public class MarkerTrackDTO extends TrackDTO {
     public void setUserId(Long userId) {
         this.userId = userId;
     }
+
+    public Boolean getHeaderMarkScore() {
+        return headerMarkScore;
+    }
+
+    public void setHeaderMarkScore(Boolean headerMarkScore) {
+        this.headerMarkScore = headerMarkScore;
+    }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/ScanOmrTaskMapper.java

@@ -31,7 +31,7 @@ public interface ScanOmrTaskMapper extends BaseMapper<ScanOmrTask> {
 														@Param("markPaperStatus") String markPaperStatus, @Param("dpr") DataPermissionRule dpr);
 
 	int getStudentCountByExamAndStatusAndUserId(@Param(value = "examId") Long examId,
-												@Param(value = "userId") Long userId, @Param(value = "status") OmrTaskStatus status, @Param("markPaperStatus") String markPaperStatus, @Param("dpr") DataPermissionRule dpr);
+												@Param("courseCode") String courseCode, @Param("coursePaperId") String coursePaperId, @Param(value = "userId") Long userId, @Param(value = "status") OmrTaskStatus status, @Param("markPaperStatus") String markPaperStatus, @Param("dpr") DataPermissionRule dpr);
 
 	int getStudentCountByExamAndStatus(@Param(value = "examId") Long examId,
 									   @Param("courseCode") String courseCode, @Param("coursePaperId") String coursePaperId, @Param(value = "status") OmrTaskStatus status, @Param("markPaperStatus") String markPaperStatus, @Param("dpr") DataPermissionRule dpr);

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

@@ -572,7 +572,7 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
 
     @Override
     public int getFinishStudentCountByExamAndUserId(Long examId, String courseCode, String coursePaperId, Long userId, DataPermissionRule dpr) {
-        return this.baseMapper.getStudentCountByExamAndStatusAndUserId(examId, userId, OmrTaskStatus.PROCESSED, MarkPaperStatus.FORMAL.name(), dpr);
+        return this.baseMapper.getStudentCountByExamAndStatusAndUserId(examId, courseCode, coursePaperId, userId, OmrTaskStatus.PROCESSED, MarkPaperStatus.FORMAL.name(), dpr);
     }
 
     @Override

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

@@ -527,11 +527,11 @@
         mark_student ms
         LEFT JOIN sys_user su ON ms.create_id = su.id
         <where>
-            ms.exam_id = #{markStudent.examId}
-            <if test="courseCode != null">
+            ms.exam_id = #{examId}
+            <if test="courseCode != null and courseCode != ''">
                 AND ms.course_code = #{courseCode}
             </if>
-            <if test="coursePaperId != null">
+            <if test="coursePaperId != null and coursePaperId != ''">
                 AND ms.course_paper_id = #{coursePaperId}
             </if>
             <if test="dpr != null">

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

@@ -115,7 +115,7 @@
 					and ms.course_paper_id = #{coursePaperId}
 				</if>
 			    <if test="markPaperStatus != null">
-					and exists(select 1 from mark_paper mp on ms.exam_id = mp.exam_id and ms.paper_number = mp.paper_number and ms.paper_type = mp.paper_type and mp.status = #{markPaperStatus})
+					and exists(select 1 from mark_paper mp where ms.exam_id = mp.exam_id and ms.paper_number = mp.paper_number and ms.paper_type = mp.paper_type and mp.status = #{markPaperStatus})
 				</if>
 				<if test="dpr != null">
 					<if test="dpr.requestUserId != null">