From c2cd651b2ca5482d0e472a3089dbfbd89f97c953 Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Thu, 24 Oct 2019 16:24:26 +0800
Subject: [PATCH] 第一章信息

---
 src/main/java/com/jevon/controller/LearnStatController.java |  2 ++
 src/main/java/com/jevon/vo/req/ChapterReq.java              |  7 +++++++
 src/main/java/com/jevon/vo/req/ChapterReqVo.java            | 17 +++++++++++++++++
 src/main/java/com/jevon/wordDTO/Form7.java                  |  4 ++++
 src/main/java/com/jevon/wordDTO/Form7RepVO.java             | 20 ++++++++++++++++++++
 5 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/jevon/controller/LearnStatController.java b/src/main/java/com/jevon/controller/LearnStatController.java
index 4b6c9f7..00f1617 100644
--- a/src/main/java/com/jevon/controller/LearnStatController.java
+++ b/src/main/java/com/jevon/controller/LearnStatController.java
@@ -59,6 +59,8 @@ public class LearnStatController {
     public Form7RepVO getForm1_1(@RequestBody GetLearnReqVo getLearnReqVo){
         Form7RepVO form7RepVO = new Form7RepVO();
         Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId());
+        form7RepVO.setExamTime(analyse.getExamTime());
+        form7RepVO.setMaxScore(analyse.getMaxScore());
         form7RepVO.setExamScope(analyse.getExamScope());
         form7RepVO.setCourseName(analyse.getCourseName());
 
diff --git a/src/main/java/com/jevon/vo/req/ChapterReq.java b/src/main/java/com/jevon/vo/req/ChapterReq.java
index 5b6c911..83e7a56 100644
--- a/src/main/java/com/jevon/vo/req/ChapterReq.java
+++ b/src/main/java/com/jevon/vo/req/ChapterReq.java
@@ -1,14 +1,21 @@
 package com.jevon.vo.req;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * @author chen
  * @version 1.0
  * @date 2019/10/24 0024 8:55
  */
+@ApiModel
 public class ChapterReq {
 
+    @ApiModelProperty(value = "考试章节")
     private int chapterNumber ;
+    @ApiModelProperty(value = "章节名称")
     private String chapterName ;
+    @ApiModelProperty(value = "章节 分值")
     private Double score ;
 
     public int getChapterNumber() {
diff --git a/src/main/java/com/jevon/vo/req/ChapterReqVo.java b/src/main/java/com/jevon/vo/req/ChapterReqVo.java
index cdfbdb1..1bf78c8 100644
--- a/src/main/java/com/jevon/vo/req/ChapterReqVo.java
+++ b/src/main/java/com/jevon/vo/req/ChapterReqVo.java
@@ -1,5 +1,8 @@
 package com.jevon.vo.req;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.util.List;
 
 /**
@@ -7,11 +10,17 @@ import java.util.List;
  * @version 1.0
  * @date 2019/10/24 0024 8:53
  */
+@ApiModel
 public class ChapterReqVo {
 
     private int analyseId ;
+    @ApiModelProperty(value = "考试时长")
     private String examTime ;
+    @ApiModelProperty(value = "考试范围 七年级上册")
     private String examScope ;
+    @ApiModelProperty(value = "满分")
+    private Double maxScore ;
+    @ApiModelProperty(value = "考试内容")
     private List<ChapterReq> list ;
 
     public int getAnalyseId() {
@@ -45,4 +54,12 @@ public class ChapterReqVo {
     public void setList(List<ChapterReq> list) {
         this.list = list;
     }
+
+    public Double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(Double maxScore) {
+        this.maxScore = maxScore;
+    }
 }
diff --git a/src/main/java/com/jevon/wordDTO/Form7.java b/src/main/java/com/jevon/wordDTO/Form7.java
index 22dbdb5..7bd6ff6 100644
--- a/src/main/java/com/jevon/wordDTO/Form7.java
+++ b/src/main/java/com/jevon/wordDTO/Form7.java
@@ -1,6 +1,7 @@
 package com.jevon.wordDTO;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @author chen
@@ -10,8 +11,11 @@ import io.swagger.annotations.ApiModel;
 @ApiModel
 public class Form7 {
 
+    @ApiModelProperty(value = "名称")
     private String name ;
+    @ApiModelProperty(value = "分值")
     private Double score ;
+    @ApiModelProperty(value = "占比")
     private Double percent ;
 
     public Double getScore() {
diff --git a/src/main/java/com/jevon/wordDTO/Form7RepVO.java b/src/main/java/com/jevon/wordDTO/Form7RepVO.java
index ffa9821..2e8a3c5 100644
--- a/src/main/java/com/jevon/wordDTO/Form7RepVO.java
+++ b/src/main/java/com/jevon/wordDTO/Form7RepVO.java
@@ -18,6 +18,10 @@ public class Form7RepVO {
     private String examScope ;
     @ApiModelProperty(value = "科目")
     private String courseName ;
+    @ApiModelProperty(value = "满分")
+    private Double maxScore ;
+    @ApiModelProperty(value = "考试时长")
+    private String examTime ;
     @ApiModelProperty(value = "章节列表对应分值")
     private List<Chapter> list ;
     @ApiModelProperty(value = "难度列表对应分值")
@@ -64,4 +68,20 @@ public class Form7RepVO {
     public void setTypeList(List<Form7> typeList) {
         this.typeList = typeList;
     }
+
+    public Double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(Double maxScore) {
+        this.maxScore = maxScore;
+    }
+
+    public String getExamTime() {
+        return examTime;
+    }
+
+    public void setExamTime(String examTime) {
+        this.examTime = examTime;
+    }
 }
--
libgit2 0.21.0