陈杰 / smartCampus

Download as
Browse Code »

Commit c2cd651b2ca5482d0e472a3089dbfbd89f97c953

Authored by 陈杰
1 parent 87ec6d46
Exists in master

第一章信息

Showing 5 changed files with 50 additions and 0 deletions   Show diff stats
src/main/java/com/jevon/controller/LearnStatController.java
  Diff comments   View file @c2cd651
@@ -59,6 +59,8 @@ public class LearnStatController { @@ -59,6 +59,8 @@ public class LearnStatController {
59 public Form7RepVO getForm1_1(@RequestBody GetLearnReqVo getLearnReqVo){ 59 public Form7RepVO getForm1_1(@RequestBody GetLearnReqVo getLearnReqVo){
60 Form7RepVO form7RepVO = new Form7RepVO(); 60 Form7RepVO form7RepVO = new Form7RepVO();
61 Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId()); 61 Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId());
  62 + form7RepVO.setExamTime(analyse.getExamTime());
  63 + form7RepVO.setMaxScore(analyse.getMaxScore());
62 form7RepVO.setExamScope(analyse.getExamScope()); 64 form7RepVO.setExamScope(analyse.getExamScope());
63 form7RepVO.setCourseName(analyse.getCourseName()); 65 form7RepVO.setCourseName(analyse.getCourseName());
64 66
src/main/java/com/jevon/vo/req/ChapterReq.java
  Diff comments   View file @c2cd651
1 package com.jevon.vo.req; 1 package com.jevon.vo.req;
2 2
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
3 /** 6 /**
4 * @author chen 7 * @author chen
5 * @version 1.0 8 * @version 1.0
6 * @date 2019/10/24 0024 8:55 9 * @date 2019/10/24 0024 8:55
7 */ 10 */
  11 +@ApiModel
8 public class ChapterReq { 12 public class ChapterReq {
9 13
  14 + @ApiModelProperty(value = "考试章节")
10 private int chapterNumber ; 15 private int chapterNumber ;
  16 + @ApiModelProperty(value = "章节名称")
11 private String chapterName ; 17 private String chapterName ;
  18 + @ApiModelProperty(value = "章节 分值")
12 private Double score ; 19 private Double score ;
13 20
14 public int getChapterNumber() { 21 public int getChapterNumber() {
src/main/java/com/jevon/vo/req/ChapterReqVo.java
  Diff comments   View file @c2cd651
1 package com.jevon.vo.req; 1 package com.jevon.vo.req;
2 2
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
3 import java.util.List; 6 import java.util.List;
4 7
5 /** 8 /**
@@ -7,11 +10,17 @@ import java.util.List; @@ -7,11 +10,17 @@ import java.util.List;
7 * @version 1.0 10 * @version 1.0
8 * @date 2019/10/24 0024 8:53 11 * @date 2019/10/24 0024 8:53
9 */ 12 */
  13 +@ApiModel
10 public class ChapterReqVo { 14 public class ChapterReqVo {
11 15
12 private int analyseId ; 16 private int analyseId ;
  17 + @ApiModelProperty(value = "考试时长")
13 private String examTime ; 18 private String examTime ;
  19 + @ApiModelProperty(value = "考试范围 七年级上册")
14 private String examScope ; 20 private String examScope ;
  21 + @ApiModelProperty(value = "满分")
  22 + private Double maxScore ;
  23 + @ApiModelProperty(value = "考试内容")
15 private List<ChapterReq> list ; 24 private List<ChapterReq> list ;
16 25
17 public int getAnalyseId() { 26 public int getAnalyseId() {
@@ -45,4 +54,12 @@ public class ChapterReqVo { @@ -45,4 +54,12 @@ public class ChapterReqVo {
45 public void setList(List<ChapterReq> list) { 54 public void setList(List<ChapterReq> list) {
46 this.list = list; 55 this.list = list;
47 } 56 }
  57 +
  58 + public Double getMaxScore() {
  59 + return maxScore;
  60 + }
  61 +
  62 + public void setMaxScore(Double maxScore) {
  63 + this.maxScore = maxScore;
  64 + }
48 } 65 }
src/main/java/com/jevon/wordDTO/Form7.java
  Diff comments   View file @c2cd651
1 package com.jevon.wordDTO; 1 package com.jevon.wordDTO;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5
5 /** 6 /**
6 * @author chen 7 * @author chen
@@ -10,8 +11,11 @@ import io.swagger.annotations.ApiModel; @@ -10,8 +11,11 @@ import io.swagger.annotations.ApiModel;
10 @ApiModel 11 @ApiModel
11 public class Form7 { 12 public class Form7 {
12 13
  14 + @ApiModelProperty(value = "名称")
13 private String name ; 15 private String name ;
  16 + @ApiModelProperty(value = "分值")
14 private Double score ; 17 private Double score ;
  18 + @ApiModelProperty(value = "占比")
15 private Double percent ; 19 private Double percent ;
16 20
17 public Double getScore() { 21 public Double getScore() {
src/main/java/com/jevon/wordDTO/Form7RepVO.java
  Diff comments   View file @c2cd651
@@ -18,6 +18,10 @@ public class Form7RepVO { @@ -18,6 +18,10 @@ public class Form7RepVO {
18 private String examScope ; 18 private String examScope ;
19 @ApiModelProperty(value = "科目") 19 @ApiModelProperty(value = "科目")
20 private String courseName ; 20 private String courseName ;
  21 + @ApiModelProperty(value = "满分")
  22 + private Double maxScore ;
  23 + @ApiModelProperty(value = "考试时长")
  24 + private String examTime ;
21 @ApiModelProperty(value = "章节列表对应分值") 25 @ApiModelProperty(value = "章节列表对应分值")
22 private List<Chapter> list ; 26 private List<Chapter> list ;
23 @ApiModelProperty(value = "难度列表对应分值") 27 @ApiModelProperty(value = "难度列表对应分值")
@@ -64,4 +68,20 @@ public class Form7RepVO { @@ -64,4 +68,20 @@ public class Form7RepVO {
64 public void setTypeList(List<Form7> typeList) { 68 public void setTypeList(List<Form7> typeList) {
65 this.typeList = typeList; 69 this.typeList = typeList;
66 } 70 }
  71 +
  72 + public Double getMaxScore() {
  73 + return maxScore;
  74 + }
  75 +
  76 + public void setMaxScore(Double maxScore) {
  77 + this.maxScore = maxScore;
  78 + }
  79 +
  80 + public String getExamTime() {
  81 + return examTime;
  82 + }
  83 +
  84 + public void setExamTime(String examTime) {
  85 + this.examTime = examTime;
  86 + }
67 } 87 }