Merge branch 'feature-addPic2Exam' into 'Develop'

add:增加习题和考试的图片链接







See merge request !921

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/models/Exam.java

@@ -62,6 +62,17 @@ public class Exam {
     @Column(name = "open_recommend")
     private int openRecommend;
 
+    @Column(name = "cover_url")
+    private String coverImgUrl;
+
+    public String getCoverImgUrl() {
+        return coverImgUrl;
+    }
+
+    public void setCoverImgUrl(String coverUrl) {
+        this.coverImgUrl = coverUrl;
+    }
+
     public int isOpenRecommend() {
         return openRecommend;
     }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/ExamVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.sun.org.apache.xpath.internal.operations.Bool;
 
 import java.util.List;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * Created by major on 2017/6/14.
@@ -32,6 +33,15 @@ public class ExamVO {
     private Integer nextIndex;
     private String nextTaskName;
     private boolean openRecommend;
+    private String coverImgUrl;
+
+    public String getCoverImgUrl() {
+        return coverImgUrl;
+    }
+
+    public void setCoverImgUrl(String coverImgUrl) {
+        this.coverImgUrl = coverImgUrl;
+    }
 
     public boolean isOpenRecommend() {
         return openRecommend;

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/ExamVOWrapper.java

@@ -58,6 +58,7 @@ public class ExamVOWrapper extends BaseWrapper<ExamVO, Exam> {
         vo.setStatus(exam.getStatus());
         vo.setOwningParty(exam.getOwningParty());
         vo.setOpenRecommend(exam.isOpenRecommend() == 1);
+        vo.setCoverImgUrl(exam.getCoverImgUrl());
         List<Group> groupList = groupService.getByExamId(vo.getId());
         wrapGroupInfo(vo, groupList);
         return vo;
@@ -158,6 +159,7 @@ public class ExamVOWrapper extends BaseWrapper<ExamVO, Exam> {
         exam.setStatus(vo.getStatus());
         exam.setOwningParty(vo.getOwningParty());
         exam.setOpenRecommend(vo.isOpenRecommend()?1:0);
+        exam.setCoverImgUrl(vo.getCoverImgUrl());
 
         return exam;
     }