|
@@ -20,6 +20,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
|
|
import org.springframework.data.mongodb.core.query.Query;
|
|
import org.springframework.data.mongodb.core.query.Query;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.util.Assert;
|
|
import org.springframework.util.Assert;
|
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import cn.com.qmth.examcloud.common.dto.question.PaperDetailDto;
|
|
import cn.com.qmth.examcloud.common.dto.question.PaperDetailDto;
|
|
import cn.com.qmth.examcloud.common.dto.question.PaperDetailUnitDto;
|
|
import cn.com.qmth.examcloud.common.dto.question.PaperDetailUnitDto;
|
|
@@ -365,6 +366,8 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
|
|
PaperDto paperDto = BeanCopierUtil.copyProperties(paper, PaperDto.class);
|
|
PaperDto paperDto = BeanCopierUtil.copyProperties(paper, PaperDto.class);
|
|
// 获取大题
|
|
// 获取大题
|
|
List<PaperDetail> paperDetails = paperDetailRepo.findByPaper(paper);
|
|
List<PaperDetail> paperDetails = paperDetailRepo.findByPaper(paper);
|
|
|
|
+ //大题根据number进行排序 PaperDetail 对象中有compareTo方法
|
|
|
|
+ Collections.sort(paperDetails);
|
|
List<PaperDetailDto> paperDetailDtos = BeanCopierUtil.copyPropertiesOfList(paperDetails, PaperDetailDto.class);
|
|
List<PaperDetailDto> paperDetailDtos = BeanCopierUtil.copyPropertiesOfList(paperDetails, PaperDetailDto.class);
|
|
paperDto.setPaperDetails(paperDetailDtos);
|
|
paperDto.setPaperDetails(paperDetailDtos);
|
|
// 封装小题
|
|
// 封装小题
|