Merge branch 'dev0410' of https://git.oschina.net/songyue123456/comm-ques-bank into dev0410

cqb-base/src/main/java/com/qmth/cqb/base/dao/CourseRepo.java

@@ -11,8 +11,9 @@ import org.springframework.data.repository.query.QueryByExampleExecutor;
  * Created by songyue on 16/12/26.
  */
 public interface CourseRepo extends MongoRepository<Course, String>,QueryByExampleExecutor<Course> {
-    List<Course> findByCourseNameLike(String courseName);
 
-    Course findByCourseNo(String courseNo);
-    
+    Course findFirstByCodeAndOrgId(String code,Long orgId);
+
+    Course findFirstByCode(String courseNo);
+
 }

cqb-base/src/main/java/com/qmth/cqb/base/model/Book.java

@@ -1,42 +0,0 @@
-package com.qmth.cqb.base.model;
-
-import java.io.Serializable;
-
-/**
- * Created by songyue on 16/12/26.
- */
-public class Book implements Serializable{
-    private static final long serialVersionUID = 6831533644114592861L;
-    private String bookNo;
-
-    private String bookName;
-
-    private String status;
-
-    public String getBookNo() {
-        return bookNo;
-    }
-
-    public void setBookNo(String bookNo) {
-        this.bookNo = bookNo;
-    }
-
-    public String getBookName() {
-        return bookName;
-    }
-
-    public void setBookName(String bookName) {
-        this.bookName = bookName;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Book() {
-    }
-}

cqb-base/src/main/java/com/qmth/cqb/base/model/Course.java

@@ -1,8 +1,11 @@
 package com.qmth.cqb.base.model;
 
+import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
 import org.springframework.data.annotation.Id;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -11,24 +14,23 @@ import java.util.Map;
  */
 public class Course implements Serializable{
     private static final long serialVersionUID = 7794074467488869343L;
+
     @Id
     private String id;
 
-    private String courseNo;
+    private String code;
 
-    private String courseName;
+    private String name;
 
-    private List<Book> book;
+    private Long orgId;
 
-    private String createTime;//创建时间
+    private CourseLevel level;
 
-    private String updateTime;//更新时间
+    private String createTime;
 
-    private Map params;
+    private String updateTime;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
+    private String enable;
 
     public String getId() {
         return id;
@@ -38,36 +40,36 @@ public class Course implements Serializable{
         this.id = id;
     }
 
-    public String getCourseNo() {
-        return courseNo;
+    public String getCode() {
+        return code;
     }
 
-    public void setCourseNo(String courseNo) {
-        this.courseNo = courseNo;
+    public void setCode(String code) {
+        this.code = code;
     }
 
-    public String getCourseName() {
-        return courseName;
+    public String getName() {
+        return name;
     }
 
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public List<Book> getBook() {
-        return book;
+    public Long getOrgId() {
+        return orgId;
     }
 
-    public void setBook(List<Book> book) {
-        this.book = book;
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
     }
 
-    public Map getParams() {
-        return params;
+    public CourseLevel getLevel() {
+        return level;
     }
 
-    public void setParams(Map params) {
-        this.params = params;
+    public void setLevel(CourseLevel level) {
+        this.level = level;
     }
 
     public String getCreateTime() {
@@ -86,6 +88,14 @@ public class Course implements Serializable{
         this.updateTime = updateTime;
     }
 
+    public String getEnable() {
+        return enable;
+    }
+
+    public void setEnable(String enable) {
+        this.enable = enable;
+    }
+
     public Course() {
     }
 }

cqb-base/src/main/java/com/qmth/cqb/base/web/CourseController.java

@@ -119,7 +119,7 @@ public class CourseController {
     @Uac(roles={RoleMeta.QUESTION_ADMIN,RoleMeta.SUPER_ADMIN},policy=UacPolicy.IN)
     @GetMapping(value = "/course/{courseNo}")
     public ResponseEntity getCourseByNo(@PathVariable String courseNo) {
-        return new ResponseEntity(courseRepo.findByCourseNo(courseNo), HttpStatus.OK);
+        return new ResponseEntity(courseRepo.findFirstByCode(courseNo), HttpStatus.OK);
     }
 
     /**

cqb-question-resource/src/main/java/com/qmth/cqb/question/model/QuestionSearchCondition.java

@@ -22,6 +22,10 @@ public class QuestionSearchCondition {
 
     private String orgId;
 
+    private String courseLevel;//课程层次
+
+    private String courseMajor;//课程专业
+
     public String getId() {
         return id;
     }
@@ -82,4 +86,22 @@ public class QuestionSearchCondition {
         this.orgId = orgId;
     }
 
+    public String getCourseLevel() {
+        return courseLevel;
+    }
+
+    public void setCourseLevel(String courseLevel) {
+        this.courseLevel = courseLevel;
+    }
+
+    public String getCourseMajor() {
+        return courseMajor;
+    }
+
+    public void setCourseMajor(String courseMajor) {
+        this.courseMajor = courseMajor;
+    }
+
+    public QuestionSearchCondition() {
+    }
 }

cqb-question-resource/src/main/java/com/qmth/cqb/question/service/QuesService.java

@@ -189,6 +189,7 @@ public class QuesService {
      * @return
      */
     public Page<Question> findAll(QuestionSearchCondition searchCondition, int curPage, int pageSize) {
+        formatQuesCondition(searchCondition);
         Question ques = BeanCopierUtil.copyProperties(searchCondition, Question.class);
         Page<Question> list = quesRepo.findAll(Example.of(ques), new PageRequest(curPage - 1, pageSize));
         for (Question question : list) {
@@ -197,6 +198,18 @@ public class QuesService {
         return list;
     }
 
+    public void formatQuesCondition(QuestionSearchCondition searchCondition){
+        if(StringUtils.isEmpty(searchCondition.getCourseNo())){
+            searchCondition.setCourseNo(null);
+        }
+        if(StringUtils.isEmpty(searchCondition.getCourseLevel())){
+            searchCondition.setCourseLevel(null);
+        }
+        if(StringUtils.isEmpty(searchCondition.getCourseMajor())){
+            searchCondition.setCourseMajor(null);
+        }
+    }
+
     /**
      * 查询按ID过滤的试题
      *