Merge remote-tracking branch 'origin/dev_v3.3.1' into dev_v3.3.1

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkArchiveController.java

@@ -3,17 +3,20 @@ package com.qmth.distributed.print.api.mark;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
-import com.alibaba.fastjson.JSONObject;
-import com.qmth.distributed.print.business.service.BasicExamService;
-import com.qmth.teachcloud.common.entity.BasicExam;
-import com.qmth.teachcloud.common.entity.BasicSemester;
-import com.qmth.teachcloud.common.service.BasicSemesterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.distributed.print.business.service.BasicExamService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicExam;
+import com.qmth.teachcloud.common.entity.BasicSemester;
+import com.qmth.teachcloud.common.service.BasicSemesterService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.mark.bean.archivescore.ArchiveScoreQuery;
@@ -73,9 +76,9 @@ public class MarkArchiveController {
 
     @ApiOperation(value = "成绩报告")
     @RequestMapping(value = "score/report", method = RequestMethod.POST)
-    public Result scoreReport(@RequestParam Long examId, @RequestParam String paperNumber) {
-        ScoreReportVo scoreReportVo = markStudentService.scoreReport(examId, paperNumber);
-        BasicExam basicExam = basicExamService.getById(examId);
+    public Result scoreReport(@Validated ArchiveStudentQuery query) {
+        ScoreReportVo scoreReportVo = markStudentService.scoreReport(query);
+        BasicExam basicExam = basicExamService.getById(query.getExamId());
         BasicSemester basicSemester = basicSemesterService.getById(basicExam.getSemesterId());
         scoreReportVo.setExamName(basicExam.getName());
         scoreReportVo.setSemesterName(basicSemester.getName());

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

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
+import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.mark.dto.mark.ScoreItem;
 
 public class ArchiveStudentVo {
@@ -197,4 +198,32 @@ public class ArchiveStudentVo {
         }
         return scoreList;
     }
+    public List<ScoreItem> getScoreList(boolean objective, List<MarkQuestion> questionList) {
+        List<ScoreItem> scoreList = new LinkedList<ScoreItem>();
+        try {
+            String[] values = StringUtils.split(objective ? objectiveScoreList : subjectiveScoreList, SPLIT);
+            int i = 0;
+            for (String value : values) {
+                i++;
+                if (questionList.size() < i) {
+                    break;
+                }
+                MarkQuestion question = questionList.get(i - 1);
+                if (question.getTotalScore() == null || question.getTotalScore() == 0) {
+                    continue;
+                }
+                ScoreItem item = ScoreItem.parse(value, objective);
+                item.setObjective(objective);
+                item.setMainNumber(question.getMainNumber());
+                item.setTitle(question.getMainTitle());
+                item.setTotalScore(question.getTotalScore());
+                item.setSubNumber(question.getSubNumber());
+                if (item != null) {
+                    scoreList.add(item);
+                }
+            }
+        } catch (Exception e) {
+        }
+        return scoreList;
+    }
 }

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

@@ -1,10 +1,13 @@
 package com.qmth.teachcloud.mark.mapper;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
-import com.qmth.teachcloud.common.enums.mark.MarkPaperStatus;
 import com.qmth.teachcloud.mark.bean.archivescore.*;
 import com.qmth.teachcloud.mark.bean.scananswer.AnswerQueryDomain;
 import com.qmth.teachcloud.mark.bean.scananswer.AnswerQueryVo;
@@ -13,9 +16,6 @@ import com.qmth.teachcloud.mark.bean.student.StudentVo;
 import com.qmth.teachcloud.mark.dto.UnexistStudentDto;
 import com.qmth.teachcloud.mark.dto.mark.score.StudentScoreDetailDto;
 import com.qmth.teachcloud.mark.entity.MarkStudent;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
@@ -51,20 +51,20 @@ public interface MarkStudentMapper extends BaseMapper<MarkStudent> {
 
 	List<ArchiveStudentVo> studentList(@Param("req") ArchiveStudentQuery query);
 
-	OverViewVo overview(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
+	OverViewVo overview(@Param("req") ArchiveStudentQuery query);
 
 	int getCountByScoreRange(@Param("examId") Long examId, @Param("paperNumber") String paperNumber,
 			@Param("start") Double start, @Param("end") Double end);
 
-	List<CollegeVo> college(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
-	List<ClassVo> classData(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
-	List<TeacherVo> teacher(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
+	List<CollegeVo> college(@Param("req") ArchiveStudentQuery query);
+	List<ClassVo> classData(@Param("req") ArchiveStudentQuery query);
+	List<TeacherVo> teacher(@Param("req") ArchiveStudentQuery query);
 
     List<UnexistStudentDto> listUnexistStudentByExamIdAndCoursePaperId(@Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("coursePaperId") String coursePaperId, @Param("status") String status, @Param("dpr") DataPermissionRule dpr);
 
 	IPage<ArchiveStudentVo> studentList(@Param("page") Page<ArchiveStudentVo> page, @Param("req") ArchiveStudentQuery query);
 
-	List<TeacherClassVo> teacherClass(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
+	List<TeacherClassVo> teacherClass(@Param("req") ArchiveStudentQuery query);
 
     int selectCountByQuery(@Param("markStudent") MarkStudent markStudent, @Param("dpr") DataPermissionRule dpr);
 

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

@@ -17,6 +17,6 @@ import java.util.List;
  */
 public interface MarkSubjectiveScoreMapper extends MppBaseMapper<MarkSubjectiveScore> {
 
-	List<QuestionVo> getSubjectiveVo(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
+	List<QuestionVo> getSubjectiveVo(@Param("studentIds")List<Long> studentIds);
 
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkStudentService.java

@@ -116,7 +116,7 @@ public interface MarkStudentService extends IService<MarkStudent> {
 
     void scoreExport(ArchiveStudentQuery query, HttpServletResponse response);
 
-    ScoreReportVo scoreReport(Long examId, String paperNumber);
+    ScoreReportVo scoreReport(ArchiveStudentQuery query);
 
     void exportUnexist(Long examId, String courseCode, String coursePaperId, HttpServletResponse response);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkSubjectiveScoreService.java

@@ -27,7 +27,7 @@ public interface MarkSubjectiveScoreService extends IMppService<MarkSubjectiveSc
 
     void deleteByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer groupNumber);
 
-	List<QuestionVo> getSubjectiveVo(Long examId, String paperNumber);
+	List<QuestionVo> getSubjectiveVo(List<Long> studentIds);
 	
 	  List<MarkSubjectiveScore> listByStudentId(Long studentId);
 }

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

@@ -898,7 +898,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                 "成绩"};
         List<MarkQuestion> oQuestionList = markQuestionService.listQuestionByExamIdAndPaperNumberAndGroupNumber(query.getExamId(), query.getPaperNumber(), null, true);
         List<MarkQuestion> sQuestionList = markQuestionService.listQuestionByExamIdAndPaperNumberAndGroupNumber(query.getExamId(), query.getPaperNumber(), null, false);
-        List<String> columnNameList = Arrays.asList(columnName);
+        List<String> columnNameList = new ArrayList<>(Arrays.asList(columnName));
         for (MarkQuestion question : oQuestionList) {
             columnNameList.add(question.getMainTitle() + " " + question.getMainNumber() + "-" + question.getSubNumber() + "选项");
             columnNameList.add(question.getMainTitle() + " " + question.getMainNumber() + "-" + question.getSubNumber() + "得分");
@@ -918,17 +918,17 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
             valueList.add(s.getClassName());
             valueList.add(s.getCourseCode());
             valueList.add(s.getCourseName());
-            valueList.add(s.getObjectiveScore().toString());
-            valueList.add(s.getSubjectiveScore().toString());
-            valueList.add(s.getTotalScore().toString());
-            for (ScoreItem item : s.getScoreList(true)) {
+            valueList.add(s.getObjectiveScore()==null?"":s.getObjectiveScore().toString());
+            valueList.add(s.getSubjectiveScore()==null?"":s.getSubjectiveScore().toString());
+            valueList.add(s.getTotalScore()==null?"":s.getTotalScore().toString());
+            for (ScoreItem item : s.getScoreList(true,oQuestionList)) {
                 valueList.add(item.getAnswer());
-                valueList.add(item.getScore().toString());
+                valueList.add(item.getScore()==null?"":item.getScore().toString());
             }
-            for (ScoreItem item : s.getScoreList(false)) {
+            for (ScoreItem item : s.getScoreList(false,sQuestionList)) {
                 valueList.add(item.getScore().toString());
             }
-            String[] columnValue = valueList.toArray(new String[0]);
+            String[] columnValue = valueList.toArray(new String[valueList.size()]);
             columnValues.add(columnValue);
         }
         try {
@@ -948,9 +948,9 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
     }
 
     @Override
-    public ScoreReportVo scoreReport(Long examId, String paperNumber) {
+    public ScoreReportVo scoreReport(ArchiveStudentQuery query) {
         ScoreReportVo ret = new ScoreReportVo();
-        ret.setOverview(baseMapper.overview(examId, paperNumber));
+        ret.setOverview(baseMapper.overview(query));
         if (ret.getOverview() != null) {
             double total = ret.getOverview().getStudentCount() - ret.getOverview().getAbsentCount();
             ret.getOverview().setPassRate(
@@ -959,10 +959,10 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                     .divide2String(Calculator.multiply(ret.getOverview().getExcellentCount(), 100), total, 2));
             ret.getOverview().setAvgScore(Calculator.round(ret.getOverview().getAvgScore(), 2));
         }
+        List<ArchiveStudentVo> studentList= baseMapper.studentList(query);
+        fillScoreRange(ret, studentList);
 
-        fillScoreRange(ret, examId, paperNumber);
-
-        ret.setCollege(baseMapper.college(examId, paperNumber));
+        ret.setCollege(baseMapper.college(query));
         if (CollectionUtils.isNotEmpty(ret.getCollege())) {
             for (CollegeVo vo : ret.getCollege()) {
                 double total = vo.getStudentCount() - vo.getAbsentCount();
@@ -975,7 +975,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
             }
         }
 
-        ret.setClassData(baseMapper.classData(examId, paperNumber));
+        ret.setClassData(baseMapper.classData(query));
         if (CollectionUtils.isNotEmpty(ret.getClassData())) {
             for (ClassVo vo : ret.getClassData()) {
                 double total = vo.getStudentCount() - vo.getAbsentCount();
@@ -988,7 +988,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
             }
         }
 
-        ret.setTeacher(baseMapper.teacher(examId, paperNumber));
+        ret.setTeacher(baseMapper.teacher(query));
         if (CollectionUtils.isNotEmpty(ret.getTeacher())) {
             for (TeacherVo vo : ret.getTeacher()) {
                 double total = vo.getStudentCount() - vo.getAbsentCount();
@@ -1001,7 +1001,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
             }
         }
 
-        ret.setTeacherClass(baseMapper.teacherClass(examId, paperNumber));
+        ret.setTeacherClass(baseMapper.teacherClass(query));
         if (CollectionUtils.isNotEmpty(ret.getTeacherClass())) {
             for (TeacherClassVo vo : ret.getTeacherClass()) {
                 double total = vo.getStudentCount() - vo.getAbsentCount();
@@ -1012,9 +1012,9 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
             }
         }
 
-        fillObjective(ret, examId, paperNumber);
-
-        ret.setSubjective(markSubjectiveScoreService.getSubjectiveVo(examId, paperNumber));
+        fillObjective(ret, studentList,query.getExamId(),query.getPaperNumber());
+        List<Long> studentIds = studentList.stream().map(ArchiveStudentVo::getStudentId).collect(Collectors.toList());
+        ret.setSubjective(markSubjectiveScoreService.getSubjectiveVo(studentIds));
         if (CollectionUtils.isNotEmpty(ret.getSubjective())) {
             for (QuestionVo vo : ret.getSubjective()) {
                 double total = vo.getStudentCount();
@@ -1168,12 +1168,11 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
         return this.update(updateWrapper);
     }
 
-    private void fillObjective(ScoreReportVo ret, Long examId, String paperNumber) {
+    private void fillObjective(ScoreReportVo ret, List<ArchiveStudentVo> studentList,Long examId, String paperNumber) {
         List<MarkQuestion> qs = markQuestionService.listByExamIdAndPaperNumberAndPaperType(examId, paperNumber, null, true);
-        List<MarkStudent> students = listByExamIdAndPaperNumberAndNotAbsent(examId, paperNumber);
         Map<String, QuestionVo> map = new HashMap<>();
         List<QuestionVo> list = new ArrayList<>();
-        for (MarkStudent s : students) {
+        for (ArchiveStudentVo s : studentList) {
             List<ScoreItem> sis = s.getScoreList(true, qs);
             if (CollectionUtils.isNotEmpty(sis)) {
                 for (ScoreItem si : sis) {
@@ -1247,27 +1246,26 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
         return this.list(wrapper);
     }
 
-    private void fillScoreRange(ScoreReportVo ret, Long examId, String paperNumber) {
-        int toltal = getCountByPaperNumber(examId, paperNumber);
+    private void fillScoreRange(ScoreReportVo ret, List<ArchiveStudentVo> list ) {
         List<ScoreRangeVo> scoreRange = new ArrayList<>();
         ret.setScoreRange(scoreRange);
-        scoreRange.add(getScoreRangeVo(toltal, examId, paperNumber, 1.0, 9.5));
-        scoreRange.add(getScoreRangeVo(toltal, examId, paperNumber, 10.0, 19.5));
-        scoreRange.add(getScoreRangeVo(toltal, examId, paperNumber, 20.0, 29.5));
-        scoreRange.add(getScoreRangeVo(toltal, examId, paperNumber, 30.0, 39.5));
-        scoreRange.add(getScoreRangeVo(toltal, examId, paperNumber, 40.0, 49.5));
-        scoreRange.add(getScoreRangeVo(toltal, examId, paperNumber, 50.0, 59.5));
-        scoreRange.add(getScoreRangeVo(toltal, examId, paperNumber, 60.0, 69.5));
-        scoreRange.add(getScoreRangeVo(toltal, examId, paperNumber, 70.0, 79.5));
-        scoreRange.add(getScoreRangeVo(toltal, examId, paperNumber, 80.0, 89.5));
-        scoreRange.add(getScoreRangeVo(toltal, examId, paperNumber, 90.0, 100.0));
+        scoreRange.add(getScoreRangeVo( list, 1.0, 9.5));
+        scoreRange.add(getScoreRangeVo( list, 10.0, 19.5));
+        scoreRange.add(getScoreRangeVo( list, 20.0, 29.5));
+        scoreRange.add(getScoreRangeVo( list, 30.0, 39.5));
+        scoreRange.add(getScoreRangeVo( list, 40.0, 49.5));
+        scoreRange.add(getScoreRangeVo( list, 50.0, 59.5));
+        scoreRange.add(getScoreRangeVo( list, 60.0, 69.5));
+        scoreRange.add(getScoreRangeVo( list, 70.0, 79.5));
+        scoreRange.add(getScoreRangeVo( list, 80.0, 89.5));
+        scoreRange.add(getScoreRangeVo( list, 90.0, 100.0));
     }
 
-    private ScoreRangeVo getScoreRangeVo(int toltal, Long examId, String paperNumber, Double start, Double end) {
-        int count = getCount(examId, paperNumber, start, end);
+    private ScoreRangeVo getScoreRangeVo(List<ArchiveStudentVo> list, Double start, Double end) {
+        int count = (int) list.stream().filter(s-> s.getTotalScore()>=start && s.getTotalScore()<=end).count();
         Double rate = null;
-        if (toltal != 0) {
-            rate = Calculator.multiply(count, toltal, 2);
+        if (list.size() != 0) {
+            rate = Calculator.multiply(count, list.size(), 2);
         }
         ScoreRangeVo vo = new ScoreRangeVo(count, start, end, rate);
         return vo;
@@ -1281,10 +1279,6 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
         return this.count(wrapper);
     }
 
-    private int getCount(Long examId, String paperNumber, Double start, Double end) {
-        return baseMapper.getCountByScoreRange(examId, paperNumber, start, end);
-    }
-
     @Override
     public int getAssignedCount(Long examId, Boolean checked, String courseCode, String coursePaperId,
                                 MarkPaperStatus status, DataPermissionRule dpr) {

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

@@ -97,8 +97,8 @@ public class MarkSubjectiveScoreServiceImpl extends MppServiceImpl<MarkSubjectiv
 //    }
 
 	@Override
-	public List<QuestionVo> getSubjectiveVo(Long examId, String paperNumber) {
-		return this.baseMapper.getSubjectiveVo(examId, paperNumber);
+	public List<QuestionVo> getSubjectiveVo(List<Long> studentIds) {
+		return this.baseMapper.getSubjectiveVo(studentIds);
 	}
 
 	@Override

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

@@ -294,55 +294,58 @@
     </select>
     <select id="studentList"
             resultType="com.qmth.teachcloud.mark.bean.archivescore.ArchiveStudentVo">
-        select t.*,t.id studentId, ifnull(t.objective_score,0)+ifnull(t.subjective_score,0) totalScore
-        from mark_student t
-        where t.exam_id=#{req.examId} and t.paper_number=#{req.paperNumber}
+        select s.*,s.id studentId, ifnull(s.objective_score,0)+ifnull(s.subjective_score,0) totalScore
+        from mark_student s
+        <include refid="archiveQuery"/>
+        <if test="req.orderType != null and req.orderType != '' and req.orderField != null and req.orderField != ''">
+            <choose>
+                <when test="req.orderField == 'totalScore'">
+                    <if test="req.orderType == 'ASC'">
+                        order by (ifnull(s.objective_score, 0) + ifnull(s.subjective_score, 0)) ASC
+                    </if>
+                    <if test="req.orderType == 'DESC'">
+                        order by (ifnull(s.objective_score, 0) + ifnull(s.subjective_score, 0)) DESC
+                    </if>
+                </when>
+                <otherwise>
+                    order by #{req.orderField} #{req.orderType}
+                </otherwise>
+            </choose>
+        </if>
+        <if test="req.orderType == null or req.orderType == '' or req.orderField == null or req.orderField == ''">
+            order by s.student_code
+        </if>
+    </select>
+    <sql id="archiveQuery">
+        where s.exam_id=#{req.examId} and s.paper_number=#{req.paperNumber}
         <if test="req.studentCode != null and req.studentCode !=''">
-            and t.student_code=#{req.studentCode}
+            and s.student_code=#{req.studentCode}
         </if>
         <if test="req.startStudentCode != null and req.startStudentCode !=''">
-            and t.student_code &gt;= #{req.startStudentCode}
+            and s.student_code &gt;= #{req.startStudentCode}
         </if>
         <if test="req.endStudentCode != null and req.endStudentCode !=''">
-            and t.student_code &lt;= #{req.endStudentCode}
+            and s.student_code &lt;= #{req.endStudentCode}
         </if>
         <if test="req.studentName != null and req.studentName !=''">
-            and t.student_name=#{req.studentName}
+            and s.student_name=#{req.studentName}
         </if>
         <if test="req.college != null and req.college !=''">
-            and t.college like concat(#{req.college}, '%')
+            and s.college like concat(#{req.college}, '%')
         </if>
         <if test="req.majorName != null and req.majorName !=''">
-            and t.major_name like concat(#{req.majorName}, '%')
+            and s.major_name like concat(#{req.majorName}, '%')
         </if>
         <if test="req.className != null and req.className !=''">
-            and t.class_name like concat(#{req.className}, '%')
+            and s.class_name like concat(#{req.className}, '%')
         </if>
         <if test="req.startScore != null and req.startScore !=''">
-            and (ifnull(t.objective_score,0)+ifnull(t.subjective_score,0)) &gt;= #{req.startScore}
+            and (ifnull(s.objective_score,0)+ifnull(s.subjective_score,0)) &gt;= #{req.startScore}
         </if>
         <if test="req.endScore != null and req.endScore !=''">
-            and (ifnull(t.objective_score,0)+ifnull(t.subjective_score,0)) &lt;= #{req.endScore}
-        </if>
-        <if test="req.orderType != null and req.orderType != '' and req.orderField != null and req.orderField != ''">
-            <choose>
-                <when test="req.orderField == 'totalScore'">
-                    <if test="req.orderType == 'ASC'">
-                        order by (ifnull(t.objective_score, 0) + ifnull(t.subjective_score, 0)) ASC
-                    </if>
-                    <if test="req.orderType == 'DESC'">
-                        order by (ifnull(t.objective_score, 0) + ifnull(t.subjective_score, 0)) DESC
-                    </if>
-                </when>
-                <otherwise>
-                    order by #{req.orderField} #{req.orderType}
-                </otherwise>
-            </choose>
+            and (ifnull(s.objective_score,0)+ifnull(s.subjective_score,0)) &lt;= #{req.endScore}
         </if>
-        <if test="req.orderType == null or req.orderType == '' or req.orderField == null or req.orderField == ''">
-            order by t.student_code
-        </if>
-    </select>
+    </sql>
     <select id="overview" resultType="com.qmth.teachcloud.mark.bean.archivescore.OverViewVo">
         SELECT count(*)                                                                                 studentCount,
                sum(case
@@ -363,8 +366,7 @@
                  left join mark_paper t on s.exam_id = t.exam_id
             and s.paper_number = t.paper_number
             and s.paper_type = t.paper_type
-        WHERE s.exam_id = #{examId}
-          and s.paper_number = #{paperNumber}
+        <include refid="archiveQuery"/>
     </select>
     <select id="getCountByScoreRange" resultType="int">
         SELECT count(*)
@@ -391,9 +393,8 @@
                  left join mark_paper t on s.exam_id = t.exam_id
             and s.paper_number = t.paper_number
             and s.paper_type = t.paper_type
-        WHERE s.exam_id = #{examId}
-          and s.paper_number = #{paperNumber}
-          and s.college is not null
+            <include refid="archiveQuery"/>
+            and s.college is not null
         group by s.college
     </select>
     <select id="classData" resultType="com.qmth.teachcloud.mark.bean.archivescore.ClassVo">
@@ -413,9 +414,8 @@
                  left join mark_paper t on s.exam_id = t.exam_id
             and s.paper_number = t.paper_number
             and s.paper_type = t.paper_type
-        WHERE s.exam_id = #{examId}
-          and s.paper_number = #{paperNumber}
-          and s.class_name is not null
+            <include refid="archiveQuery"/>
+            and s.class_name is not null
         group by s.class_name
     </select>
     <select id="teacher" resultType="com.qmth.teachcloud.mark.bean.archivescore.TeacherVo">
@@ -435,9 +435,8 @@
                  left join mark_paper t on s.exam_id = t.exam_id
             and s.paper_number = t.paper_number
             and s.paper_type = t.paper_type
-        WHERE s.exam_id = #{examId}
-          and s.paper_number = #{paperNumber}
-          and s.teacher is not null
+            <include refid="archiveQuery"/>
+            and s.teacher is not null
         group by s.teacher
     </select>
     <select id="findOne" resultType="com.qmth.teachcloud.mark.bean.student.StudentVo"
@@ -502,9 +501,8 @@
                  left join mark_paper t on s.exam_id = t.exam_id
             and s.paper_number = t.paper_number
             and s.paper_type = t.paper_type
-        WHERE s.exam_id = #{examId}
-          and s.paper_number = #{paperNumber}
-          and s.class_name is not null
+            <include refid="archiveQuery"/>
+            and s.class_name is not null
         group by s.teacher, s.class_name
     </select>
     <select id="selectCountByQuery" resultType="java.lang.Integer">

teachcloud-mark/src/main/resources/mapper/ExamTaskPaperDataService.xml → teachcloud-mark/src/main/resources/mapper/MarkSubjectiveScoreMapper.xml

@@ -26,7 +26,10 @@
         left join mark_question t on t.exam_id=s.exam_id and t.paper_number=s.paper_number 
         and t.main_number=s.main_number and t.sub_number=s.sub_number
         WHERE
-            s.exam_id = #{examId} and s.paper_number = #{paperNumber}
+            s.student_id In
+            <foreach collection="studentIds" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         group by t.main_title,t.main_number,t.sub_number,t.total_score
         order by t.main_number,t.sub_number
     </select>