|
@@ -324,8 +324,6 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
|
TBTaskHistory tbTaskHistory = (TBTaskHistory) map.get("tbTaskHistory");
|
|
|
JSONObject jsonObject = Objects.nonNull(tbTaskHistory.getRemark()) ? JSONObject.parseObject(tbTaskHistory.getRemark()) : null;
|
|
|
Integer totalTaskSize = 1, currentTaskSize = 1, jsTotalTaskSize = 0, jsCurrentTaskSize = 0;
|
|
|
- //测试
|
|
|
-// Long cloudMarkExamId = 576L;
|
|
|
|
|
|
Long cloudMarkExamId = null;
|
|
|
TEExam teExam = teExamService.cacheConvert(examCacheBean);
|
|
@@ -356,25 +354,11 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
|
//推送试卷科目
|
|
|
Set<Long> examPaperIdSet = pushExamPaperLogic(map, jsonObject, totalTaskSize, jsCurrentTaskSize, currentTaskSize, cloudMarkExamId);
|
|
|
|
|
|
- //测试
|
|
|
-// QueryWrapper<TEExamPaper> teExamPaperQueryWrapper = new QueryWrapper<>();
|
|
|
-// teExamPaperQueryWrapper.lambda().eq(TEExamPaper::getExamId, examId)
|
|
|
-// .gt(TEExamPaper::getTotalSubjectiveScore, 0).orderByAsc(TEExamPaper::getId);
|
|
|
-// List<TEExamPaper> teExamPaperList = teExamPaperService.list(teExamPaperQueryWrapper);
|
|
|
-// if (CollectionUtils.isEmpty(teExamPaperList)) {
|
|
|
-// throw new BusinessException("没有考试试卷");
|
|
|
-// }
|
|
|
-// Set<Long> examPaperIdSet = teExamPaperList.stream().map(s -> s.getId()).collect(Collectors.toSet());
|
|
|
-
|
|
|
//获取所有待阅卷的考生
|
|
|
List<TEExamStudent> teExamStudentList = getExamStudentNeedMarkAll(map, jsonObject, teExam, examPaperIdSet, jsTotalTaskSize, jsCurrentTaskSize);
|
|
|
- //测试
|
|
|
-// teExamStudentList = teExamStudentList.stream().filter(s -> s.getId().longValue() == 1607955922658508822L).collect(Collectors.toList());
|
|
|
|
|
|
//获取只有一次考试记录的考生
|
|
|
List<TOeExamRecord> tOeExamRecordList = getExamRecordOnce(map, jsonObject, examPaperIdSet);
|
|
|
- //测试
|
|
|
-// tOeExamRecordList.clear();
|
|
|
|
|
|
//获取多次考试记录的考试
|
|
|
List<TOeExamRecord> tOeExamRecordManyList = tOeExamRecordService.findExamRecordNeedMarkAll(examId, examPaperIdSet, true);
|