add：归档管理成绩查询 班级列表查询导出新增客观题主观题分数查询条件

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/ArchiveStudentQuery.java

@@ -1,11 +1,8 @@
 package com.qmth.teachcloud.mark.bean.archivescore;
 
-import javax.validation.constraints.NotNull;
-
 import com.qmth.teachcloud.mark.utils.PagerQuery;
-import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.RequestParam;
-import oshi.jna.platform.mac.SystemB;
+
+import javax.validation.constraints.NotNull;
 
 public class ArchiveStudentQuery extends PagerQuery {
     @NotNull(message = "考试Id不能为空")
@@ -25,6 +22,16 @@ public class ArchiveStudentQuery extends PagerQuery {
     private Double startScore;
     // 成绩区间结束
     private Double endScore;
+
+    // 客观题成绩区间开始
+    private Double objectiveStartScore;
+    // 客观题成绩区间结束
+    private Double objectiveEndScore;
+    // 主观题成绩区间开始
+    private Double subjectiveStartScore;
+    // 主观题成绩区间结束
+    private Double subjectiveEndScore;
+
     private String orderType;
     private String orderField;
 
@@ -116,7 +123,39 @@ public class ArchiveStudentQuery extends PagerQuery {
         this.endScore = endScore;
     }
 
-	public String getOrderType() {
+    public Double getObjectiveStartScore() {
+        return objectiveStartScore;
+    }
+
+    public void setObjectiveStartScore(Double objectiveStartScore) {
+        this.objectiveStartScore = objectiveStartScore;
+    }
+
+    public Double getObjectiveEndScore() {
+        return objectiveEndScore;
+    }
+
+    public void setObjectiveEndScore(Double objectiveEndScore) {
+        this.objectiveEndScore = objectiveEndScore;
+    }
+
+    public Double getSubjectiveStartScore() {
+        return subjectiveStartScore;
+    }
+
+    public void setSubjectiveStartScore(Double subjectiveStartScore) {
+        this.subjectiveStartScore = subjectiveStartScore;
+    }
+
+    public Double getSubjectiveEndScore() {
+        return subjectiveEndScore;
+    }
+
+    public void setSubjectiveEndScore(Double subjectiveEndScore) {
+        this.subjectiveEndScore = subjectiveEndScore;
+    }
+
+    public String getOrderType() {
 		return orderType;
 	}
 

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

@@ -385,6 +385,18 @@
         <if test="req.endScore != null and req.endScore !=''">
             and (ifnull(s.objective_score,0)+ifnull(s.subjective_score,0)) &lt;= #{req.endScore}
         </if>
+        <if test="req.objectiveStartScore != null and req.objectiveStartScore !=''">
+            and ifnull(s.objective_score,0) &gt;= #{req.objectiveStartScore}
+        </if>
+        <if test="req.objectiveEndScore != null and req.objectiveEndScore !=''">
+            and ifnull(s.objective_score,0) &lt;= #{req.objectiveEndScore}
+        </if>
+        <if test="req.subjectiveStartScore != null and req.subjectiveStartScore !=''">
+            and ifnull(s.subjective_score,0) &gt;= #{req.subjectiveStartScore}
+        </if>
+        <if test="req.subjectiveEndScore != null and req.subjectiveEndScore !=''">
+            and ifnull(s.subjective_score,0) &lt;= #{req.subjectiveEndScore}
+        </if>
         <if test="dpr != null">
             <if test="dpr.requestUserId != null">
                 AND s.teacher_id = #{dpr.requestUserId}