Forráskód Böngészése

优化去任务接口

yin 7 hónapja
szülő
commit
8dd2e09302

+ 4 - 0
src/main/java/cn/com/qmth/scancentral/service/impl/StudentServiceImpl.java

@@ -2035,7 +2035,9 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
             Long pageSize, User user) {
         IPage<AnswerQueryVo> result = this.baseMapper.getAssignedCheckTaskHistory(new Page<>(pageNumber, pageSize),
                 examId, subjectCode, user.getId());
+        SubjectEntity subject = subjectService.findByExamIdAndCode(examId,subjectCode);
         for (AnswerQueryVo t : result.getRecords()) {
+            t.setSubjectName(subject.getName());
             t = toTaskVo(t);
         }
         return PageUtil.of(result);
@@ -2055,6 +2057,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         } else {
             checkCount = 1;
         }
+        SubjectEntity subject = subjectService.findByExamIdAndCode(examId,subjectCode);
         while (task == null) {
             IPage<AnswerQueryVo> list = this.findUnCheck(examId, subjectCode, checkCount, retry, 20);
             if (list.getRecords().isEmpty()) {
@@ -2063,6 +2066,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
             for (AnswerQueryVo t : list.getRecords()) {
                 StudentEntity student = this.getById(t.getId());
                 if (this.apply(student, user.getAccount())) {
+                    t.setSubjectName(subject.getName());
                     task = toTaskVo(t);
                     break;
                 }

+ 6 - 6
src/main/resources/mapper/StudentMapper.xml

@@ -459,13 +459,13 @@
     </select>
 
     <select id="findUnCheck" resultType="cn.com.qmth.scancentral.vo.answerquery.AnswerQueryVo">
-        select t.*,
-               c.paper_count cardPaperCount,
-               s.name        subjectName
+        select t.*
+--                , c.paper_count cardPaperCount,
+--                s.name        subjectName
         from sc_student t
-                 left join sc_answer_card c on t.exam_id = c.exam_id and
-                                               t.card_number = c.number
-                 left join sc_subject s on s.code = t.subject_code and s.exam_id = t.exam_id
+--                  left join sc_answer_card c on t.exam_id = c.exam_id and
+--                                                t.card_number = c.number
+--                  left join sc_subject s on s.code = t.subject_code and s.exam_id = t.exam_id
         where t.exam_id = #{examId}
           and t.subject_code = #{subjectCode}
           and t.assigned_check_count = #{checkCount}