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

1.移动端对练列表增加资料列表返回

parent 033259bb
......@@ -689,6 +689,19 @@ public class AppExamineService {
PageResult<ExamineMobileDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null);
if(CollectionUtil.isNotEmpty(page.getRecords())) {
// 对练场景关联资料
List<WikiListMobileDto> wikiList = Lists.newArrayList();
WikiRequestModel wkRequest = new WikiRequestModel();
wkRequest.setSceneCategoryId(requestModel.getCategoryId());
List<WikiResponseModel> wikiResponseModels = examineService.wikiList(wkRequest);
if(CollectionUtil.isNotEmpty(wikiResponseModels)) {
wikiList = wikiResponseModels.stream().map(v -> {
WikiListMobileDto dto = BeanUtil.copyProperties(v, WikiListMobileDto.class);
return dto;
}).collect(Collectors.toList());
}
List<WikiListMobileDto> finalWikiList = wikiList;
List<ExamineMobileDto> dtoList = page.getRecords().stream().map(v -> {
ExamineMobileDto dto = BeanUtil.copyProperties(v, ExamineMobileDto.class);
......@@ -719,6 +732,7 @@ public class AppExamineService {
dto.setMaxOverallScore(maxOverallScore.intValue());
dto.setExamCount(examCount);
dto.setPracticeCount(practiceCount);
dto.setWikiList(finalWikiList);
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