Commit d4a1e3b9 authored by 陈立彬's avatar 陈立彬

对练列表返回对练练习次数

parent 6d150b86
......@@ -487,7 +487,7 @@ public class AppExamineService {
if(CollectionUtil.isNotEmpty(recordList)) {
examCount = recordList.stream().filter(v -> Objects.equals(v.getExamineMode(), 1)).count();
examTotalCount = recordList.size();
practiceCount = examTotalCount - examTotalCount;
practiceCount = examTotalCount - examCount;
maxOverallScore = recordList.stream().filter(v -> Objects.nonNull(v.getOverallScore())).mapToDouble(ExamineRecordResponseModel::getOverallScore).max().getAsDouble();
}
......@@ -666,28 +666,36 @@ public class AppExamineService {
PageResult<ExamineMobileDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null);
if(CollectionUtil.isNotEmpty(page.getRecords())) {
ExamineRecordRequestModel rm = new ExamineRecordRequestModel();
rm.setUserId(userPrincipal.getUserId());
List<ExamineRecordResponseModel> userRecordList = examineService.examineRecordList(rm);
List<ExamineMobileDto> dtoList = page.getRecords().stream().map(v -> {
ExamineMobileDto dto = BeanUtil.copyProperties(v, ExamineMobileDto.class);
// 已考人数
long examTotalCount = 0;
// 考试次数
long examCount = 0;
long practiceCount = 0;
double maxOverallScore = 0;
ExamineRecordRequestModel req = new ExamineRecordRequestModel();
req.setExamineId(v.getId());
List<ExamineRecordResponseModel> recordList = examineService.examineRecordList(req);
if(CollectionUtil.isNotEmpty(recordList)) {
examCount = recordList.size();
}
dto.setExamTotalCount(examCount);
examTotalCount = recordList.size();
// 是否已考
long count = userRecordList.stream().filter(u -> Objects.equals(u.getExamineId(), v.getId())).count();
if(count > 0) {
dto.setExamFlag(true);
examCount = recordList.stream().filter(r -> Objects.equals(r.getExamineMode(), 1)).count();
practiceCount = examTotalCount - examCount;
maxOverallScore = recordList.stream().filter(r -> Objects.nonNull(r.getOverallScore())).mapToDouble(ExamineRecordResponseModel::getOverallScore).max().getAsDouble();
// 是否已考
long count = recordList.stream().filter(r -> Objects.equals(r.getUserId(), userPrincipal.getUserId())).count();
if(count > 0) {
dto.setExamFlag(true);
}
}
dto.setExamTotalCount(examTotalCount);
dto.setMaxOverallScore(maxOverallScore);
dto.setExamCount(examCount);
dto.setPracticeCount(practiceCount);
return dto;
}).collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment