修改查询试卷为mongotemplate

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/PaperServiceImpl.java

@@ -215,10 +215,18 @@ public class PaperServiceImpl implements PaperService{
      * @return
      */
     public List<Paper> getImportPapersBySearch(PaperSearchInfo paperSearchInfo) {
-        formatPaperSearchInfo(paperSearchInfo);
-        Paper importPaper = BeanCopierUtil.copyProperties(paperSearchInfo, Paper.class);
-        importPaper.setPaperType(PaperType.IMPORT);
-        return paperRepo.findAll(Example.of(importPaper));
+        Query query = new Query();
+        query.addCriteria(Criteria.where("orgId").is(paperSearchInfo.getOrgId()));
+        query.addCriteria(Criteria.where("paperType").is(PaperType.IMPORT.name()));
+        query.addCriteria(Criteria.where("course.enable").is("true"));
+        if(StringUtils.isNotBlank(paperSearchInfo.getCourseNo())){
+            query.addCriteria(Criteria.where("course.code").is(paperSearchInfo.getCourseNo()));
+        }
+        if(StringUtils.isNotBlank(paperSearchInfo.getLevel())){
+            query.addCriteria(Criteria.where("course.level").is(paperSearchInfo.getLevel()));
+        }
+        List<Paper> paperList = this.mongoTemplate.find(query, Paper.class);
+        return paperList;
     }
 
     /**
@@ -228,10 +236,18 @@ public class PaperServiceImpl implements PaperService{
      * @return
      */
     public List<Paper> getGenPapersBySearch(PaperSearchInfo paperSearchInfo) {
-        formatPaperSearchInfo(paperSearchInfo);
-        Paper genPaper = BeanCopierUtil.copyProperties(paperSearchInfo, Paper.class);
-        genPaper.setPaperType(PaperType.GENERATE);
-        return paperRepo.findAll(Example.of(genPaper));
+        Query query = new Query();
+        query.addCriteria(Criteria.where("orgId").is(paperSearchInfo.getOrgId()));
+        query.addCriteria(Criteria.where("paperType").is(PaperType.GENERATE.name()));
+        query.addCriteria(Criteria.where("course.enable").is("true"));
+        if(StringUtils.isNotBlank(paperSearchInfo.getCourseNo())){
+            query.addCriteria(Criteria.where("course.code").is(paperSearchInfo.getCourseNo()));
+        }
+        if(StringUtils.isNotBlank(paperSearchInfo.getLevel())){
+            query.addCriteria(Criteria.where("course.level").is(paperSearchInfo.getLevel()));
+        }
+        List<Paper> paperList = this.mongoTemplate.find(query, Paper.class);
+        return paperList;
     }
 
     /**