增加待考列表接口

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java

@@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.themis.business.bean.exam.ExamPrepareBean;
 import com.qmth.themis.business.dao.TEExamMapper;
 import com.qmth.themis.business.entity.TEExam;
+import com.qmth.themis.business.service.TEExamActivityService;
 import com.qmth.themis.business.service.TEExamService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @Description: 考试批次 服务实现类
@@ -25,6 +27,9 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
     @Resource
     TEExamMapper teExamMapper;
 
+    @Resource
+    TEExamActivityService examActivityService;
+
     /**
      * 查询考试批次
      *
@@ -49,7 +54,15 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
      */
     @Override
     public List<Map> getWaitingExam(Long studentId) {
-        return teExamMapper.getWaitingExam(studentId);
+        List<Map> list = teExamMapper.getWaitingExam(studentId);
+        if (Objects.nonNull(list) && list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                Map m = list.get(i);
+                List<Map> teExamActivityList = examActivityService.getWaitingExam(studentId, Long.parseLong(String.valueOf(m.get("id"))), Long.parseLong(String.valueOf(m.get("examActivityId"))));
+                m.put("activities", teExamActivityList);
+            }
+        }
+        return list;
     }
 
 	@Override

themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -6,6 +6,7 @@
         select
             tee.id,
             teea.id as examActivityId,
+            toer.id as recordId,
             tee.name,
             tee.mode,
             tee.pre_notice as preNotice,

themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -6,7 +6,6 @@ import com.qmth.themis.business.dto.AuthDto;
 import com.qmth.themis.business.entity.TBSession;
 import com.qmth.themis.business.entity.TEConfig;
 import com.qmth.themis.business.entity.TEStudent;
-import com.qmth.themis.business.entity.TOeExamRecord;
 import com.qmth.themis.business.enums.MqEnum;
 import com.qmth.themis.business.enums.RoleEnum;
 import com.qmth.themis.business.enums.SystemOperationEnum;
@@ -72,9 +71,6 @@ public class TEStudentController {
     @Resource
     TEExamService teExamService;
 
-    @Resource
-    TEExamActivityService examActivityService;
-
     @Resource
     TOeExamRecordService tOeExamRecordService;
 
@@ -147,15 +143,9 @@ public class TEStudentController {
         Map unFinishExam = tOeExamRecordService.getUnFinishExam(teStudent.getId());
         if (Objects.isNull(unFinishExam)) {
             List<Map> list = teExamService.getWaitingExam(teStudent.getId());
-            if (Objects.nonNull(list) && list.size() > 0) {
-                for (int i = 0; i < list.size(); i++) {
-                    Map m = list.get(i);
-                    List<Map> teExamActivityList = examActivityService.getWaitingExam(teStudent.getId(), Long.parseLong(String.valueOf(m.get("id"))), Long.parseLong(String.valueOf(m.get("examActivityId"))));
-                    m.put("activities", teExamActivityList);
-                }
-            }
             map.put("waiting", list);
         } else {
+            unFinishExam.put("activity",unFinishExam);
             map.put("unFinished", unFinishExam);
         }
         //获取全局考试配置