第一章信息

陈杰
1 parent 1a3e7aca
Showing 24 changed files with 517 additions and 90 deletions Show diff stats
src/main/java/com/jevon/controller/LearnController.java
src/main/java/com/jevon/controller/LearnStatController.java
src/main/java/com/jevon/enums/DifficultEnums.java
src/main/java/com/jevon/mapper/AnalyseDetailMapper.java
src/main/java/com/jevon/mapper/AnalyseMapper.java
src/main/java/com/jevon/mapper/ChapterMapper.java
src/main/java/com/jevon/model/Analyse.java
src/main/java/com/jevon/model/Chapter.java
src/main/java/com/jevon/service/AnalyseDetailService.java
src/main/java/com/jevon/service/AnalyseService.java
src/main/java/com/jevon/service/ChapterService.java
src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java
src/main/java/com/jevon/service/impl/AnalyseServiceImpl.java
src/main/java/com/jevon/service/impl/ChapterServiceImpl.java
src/main/java/com/jevon/service/impl/LeagueServiceImpl.java
src/main/java/com/jevon/vo/req/ChapterReq.java
src/main/java/com/jevon/vo/req/ChapterReqVo.java
src/main/java/com/jevon/wordDTO/Form6RepVO.java
src/main/java/com/jevon/wordDTO/Form6RepVo.java
src/main/java/com/jevon/wordDTO/Form7.java
@@ -58,6 +58,9 @@ public class LearnController {
     @Autowired
     LeagueService leagueService;
+    @Autowired
+    ChapterService chapterService;
+
     @Value("${remoting.url}")
     private String url ;
     @Value("${remoting.prefixFile}")
@@ -107,7 +110,14 @@ public class LearnController {
     @RequestMapping(value = "initAnalyse", method = RequestMethod.POST)
     public BaseVo initAnalyse(@RequestBody InitAnalyseReqVo initAnalyseReqVo){
         BaseVo baseVo = new BaseVo();
-        analysisExcel(initAnalyseReqVo);
+        Analyse analyse = analyseService.selectById(initAnalyseReqVo.getAnalyseId());
+        List<AnalyseDetail> analyseDetails = analyseDetailService.selectByAnalyseId(analyse.getId());
+        if(analyseDetails != null & analyseDetails.size() > 0){
+            baseVo.setMessage("已经导入");
+            baseVo.setSuccess(false);
+        }else {
+            analysisExcel(initAnalyseReqVo);
+        }
         return baseVo;
     }
@@ -206,21 +216,23 @@ public class LearnController {
     @RequestMapping(value = "initScore", method = RequestMethod.POST)
     public BaseVo initScore(@RequestBody InitScoreReqVo initScoreReqVo){
         BaseVo baseVo = new BaseVo();
-        String schoolName = analysisScoreExcel(initScoreReqVo);
-        leagueService.initLeagueSchool(initScoreReqVo.getLeagueId(),schoolName);
+        boolean success = analysisScoreExcel(initScoreReqVo);
+        if(!success){
+            baseVo.setSuccess(false);
+            baseVo.setMessage("一个学校不能在两个联盟下");
+        }
         return baseVo;
     }
-    private String analysisScoreExcel(InitAnalyseReqVo initAnalyseReqVo){
+    private boolean analysisScoreExcel(InitScoreReqVo initScoreReqVo){
         try{
-            String schoolName = "";
-            Analyse analyse = analyseService.selectById(initAnalyseReqVo.getAnalyseId());
+            Analyse analyse = analyseService.selectById(initScoreReqVo.getAnalyseId());
             List<AnalyseDetail> analyseDetails = analyseDetailService.selectByAnalyseId(analyse.getId());
             Map<String , Double> scoreMap = new HashMap<>();
             for(AnalyseDetail analyseDetail : analyseDetails){
                 scoreMap.put(analyseDetail.getQuestionNumber(),analyseDetail.getScore());
             }
-            String fileUrl = initAnalyseReqVo.getUrl();
+            String fileUrl = initScoreReqVo.getUrl();
             fileUrl = fileUrl.replace(url, staticUrl);
             File excelFile = new File(fileUrl);
             // 获得工作簿
@@ -281,15 +293,20 @@ public class LearnController {
                        }
                     }
                 }
-                studentService.insertBatch(students);
-                studentDetailService.insertBatch(studentDetails);
-                return students.get(0).getSchoolName();
+                int i = leagueService.initLeagueSchool(initScoreReqVo.getLeagueId(),students.get(0).getSchoolName());
+                if(i > 0){
+                    studentService.insertBatch(students);
+                    studentDetailService.insertBatch(studentDetails);
+                    return true ;
+                }else {
+                    return  false ;
+                }
             }
         }catch (Exception e){
             e.printStackTrace();
             System.out.println(e.toString());
         }
-        return null ;
+        return false ;
     }
     @ApiOperation("获取该次考试联盟学校信息")
@@ -333,4 +350,22 @@ public class LearnController {
         baseVo.setMessage(league.getId() +"");
         return baseVo;
     }
+
+    @ApiOperation("基础信息输入")
+    @RequestMapping(value = "createChapter", method = RequestMethod.POST)
+    public BaseVo createChapter(@RequestBody ChapterReqVo chapterReqVo){
+        BaseVo baseVo = new BaseVo();
+        analyseService.updateChapter(chapterReqVo.getAnalyseId(),chapterReqVo.getExamTime(),chapterReqVo.getExamScope());
+        List<Chapter> list = new ArrayList<>();
+        for(ChapterReq chapterReq :chapterReqVo.getList()){
+            Chapter chapter = new Chapter();
+            chapter.setAnalyseId(chapterReqVo.getAnalyseId());
+            chapter.setChapterNumber(chapterReq.getChapterNumber());
+            chapter.setChapterName(chapterReq.getChapterName());
+            chapter.setChapterScore(chapterReq.getScore());
+            list.add(chapter);
+        }
+        chapterService.insertBatch(list);
+        return baseVo;
+    }
 }
@@ -9,7 +9,6 @@ import com.jevon.vo.req.GetLearnReqVo;
 import com.jevon.wordDTO.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,25 +51,44 @@ public class LearnStatController {
     @Autowired
     LeagueService leagueService;
-//    @ApiOperation("getForm1_1")
-//    @RequestMapping(value = "getForm1_1", method = RequestMethod.POST)
-//    public List<Form7> getForm1_1(@RequestBody GetLearnReqVo getLearnReqVo){
-//        Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId());
-//        List<Form7> list = new ArrayList<>();
-//        Form7 form7 = new Form7();
-//        form7.setName(DifficultEnums.easy.getDifficultName());
-//        form7.setPercent(analyseDetailService.selectDifficult(analyse.getId(),DifficultEnums.easy.getDifficultType())/analyse.getMaxScore()*100);
-//        list.add(form7);
-//        Form7 form = new Form7();
-//        form.setName(DifficultEnums.medium.getDifficultName());
-//        form.setPercent(analyseDetailService.selectDifficult(analyse.getId(),DifficultEnums.medium.getDifficultType())/analyse.getMaxScore()*100);
-//        list.add(form);
-//        Form7 form2 = new Form7();
-//        form2.setName(DifficultEnums.difficult.getDifficultName());
-//        form2.setPercent(analyseDetailService.selectDifficult(analyse.getId(),DifficultEnums.difficult.getDifficultType())/analyse.getMaxScore()*100);
-//        list.add(form2);
-//        return list;
-//    }
+    @Autowired
+    ChapterService chapterService;
+
+    @ApiOperation("getForm1_1")
+    @RequestMapping(value = "getForm1_1", method = RequestMethod.POST)
+    public Form7RepVO getForm1_1(@RequestBody GetLearnReqVo getLearnReqVo){
+        Form7RepVO form7RepVO = new Form7RepVO();
+        Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId());
+        form7RepVO.setExamScope(analyse.getExamScope());
+        form7RepVO.setCourseName(analyse.getCourseName());
+
+        List<Chapter> chapters = chapterService.selectByAnalyse(analyse.getId());
+        for(Chapter chapter : chapters){
+            chapter.setPercent(chapter.getChapterScore() / analyse.getMaxScore() * 100);
+        }
+        form7RepVO.setList(chapters);
+        List<Form7> difficultList = new ArrayList<>();
+        for (DifficultEnums difficultEnums : DifficultEnums.values()){
+            Form7 form7 = new Form7();
+            form7.setName(difficultEnums.getDifficultShow());
+            form7.setPercent(analyseDetailService.selectDifficult(analyse.getId(),difficultEnums.getDifficultType())/analyse.getMaxScore()*100);
+            difficultList.add(form7);
+        }
+        form7RepVO.setDifficultList(difficultList);
+
+        List<Form7> typeList = new ArrayList<>();
+        List<String> list = analyseDetailService.selectQuestionType(analyse.getId());
+        for(String type : list){
+            Form7 form7 = new Form7();
+            form7.setName(type);
+            Double score = analyseDetailService.selectSumType(analyse.getId(),type);
+            form7.setScore(score);
+            form7.setPercent(score / analyse.getMaxScore() * 100);
+            typeList.add(form7);
+        }
+        form7RepVO.setTypeList(typeList);
+        return form7RepVO;
+    }
     @ApiOperation("getForm2_1_1")
     @RequestMapping(value = "getForm2_1_1", method = RequestMethod.POST)
@@ -516,30 +534,30 @@ public class LearnStatController {
     @ApiOperation("getForm3_1")
     @RequestMapping(value = "getForm3_1", method = RequestMethod.POST)
-    public Form6RepVo getForm3_1(@RequestBody GetLearnReqVo getLearnReqVo){
+    public Form6RepVO getForm3_1(@RequestBody GetLearnReqVo getLearnReqVo){
         return initDimensional(getLearnReqVo,DimensionalEnums.knowledge.getDimensionalType());
     }
     @ApiOperation("getForm3_2")
     @RequestMapping(value = "getForm3_2", method = RequestMethod.POST)
-    public Form6RepVo getForm3_2(@RequestBody GetLearnReqVo getLearnReqVo){
+    public Form6RepVO getForm3_2(@RequestBody GetLearnReqVo getLearnReqVo){
         return initDimensional(getLearnReqVo,DimensionalEnums.skill.getDimensionalType());
     }
     @ApiOperation("getForm3_3")
     @RequestMapping(value = "getForm3_3", method = RequestMethod.POST)
-    public Form6RepVo getForm3_3(@RequestBody GetLearnReqVo getLearnReqVo){
+    public Form6RepVO getForm3_3(@RequestBody GetLearnReqVo getLearnReqVo){
         return initDimensional(getLearnReqVo,DimensionalEnums.ability.getDimensionalType());
     }
     @ApiOperation("getForm3_4")
     @RequestMapping(value = "getForm3_4", method = RequestMethod.POST)
-    public Form6RepVo getForm3_4(@RequestBody GetLearnReqVo getLearnReqVo){
+    public Form6RepVO getForm3_4(@RequestBody GetLearnReqVo getLearnReqVo){
         return initDimensional(getLearnReqVo,DimensionalEnums.think.getDimensionalType());
     }
-    private Form6RepVo initDimensional(GetLearnReqVo getLearnReqVo , int dimensionalType){
-        Form6RepVo repVO = new Form6RepVo();
+    private Form6RepVO initDimensional(GetLearnReqVo getLearnReqVo , int dimensionalType){
+        Form6RepVO repVO = new Form6RepVO();
         Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId());
         if(analyse == null){
             repVO.setSuccess(false);
@@ -638,8 +656,8 @@ public class LearnStatController {
         return repVO;
     }
-    private Form6RepVo initSchoolDimensional(GetLearnReqVo getLearnReqVo , int dimensionalType){
-        Form6RepVo repVO = new Form6RepVo();
+    private Form6RepVO initSchoolDimensional(GetLearnReqVo getLearnReqVo , int dimensionalType){
+        Form6RepVO repVO = new Form6RepVO();
         Analyse analyse = analyseService.selectById(getLearnReqVo.getAnalyseId());
         if(analyse == null){
             repVO.setSuccess(false);
@@ -736,7 +754,7 @@ public class LearnStatController {
         suggestRepVo.setDifficultyDegree(avgStr);
         suggestRepVo.setExcellentRate(aStr);
         suggestRepVo.setErrorList(getErrorRate(getLearnReqVo.getAnalyseId(),getLearnReqVo.getSchoolName(),students.size()));
-        Form6RepVo knowledge = initSchoolDimensional(getLearnReqVo,DimensionalEnums.knowledge.getDimensionalType());
+        Form6RepVO knowledge = initSchoolDimensional(getLearnReqVo,DimensionalEnums.knowledge.getDimensionalType());
         List<String> lessKnowledgeList = new ArrayList<>(); //不足50%
         List<String> midKnowledgeList = new ArrayList<>(); //50-70%
         for(Form6 form6 :knowledge.getData()){
@@ -748,7 +766,7 @@ public class LearnStatController {
         }
         suggestRepVo.setLessKnowledgeList(lessKnowledgeList);
         suggestRepVo.setMidKnowledgeList(midKnowledgeList);
-        Form6RepVo ability = initSchoolDimensional(getLearnReqVo,DimensionalEnums.ability.getDimensionalType());
+        Form6RepVO ability = initSchoolDimensional(getLearnReqVo,DimensionalEnums.ability.getDimensionalType());
         List<String> lessAbilityList = new ArrayList<>(); //不足70%
         List<String> midAbilityList = new ArrayList<>(); //70-80%
         List<String> highAbilityList = new ArrayList<>(); //大于80%
@@ -764,7 +782,7 @@ public class LearnStatController {
         suggestRepVo.setLessAbilityList(lessAbilityList);
         suggestRepVo.setMidAbilityList(midAbilityList);
         suggestRepVo.setHighAbilityList(highAbilityList);
-        Form6RepVo skill = initSchoolDimensional(getLearnReqVo,DimensionalEnums.skill.getDimensionalType());
+        Form6RepVO skill = initSchoolDimensional(getLearnReqVo,DimensionalEnums.skill.getDimensionalType());
         List<String> lessSkillList = new ArrayList<>(); //不足70%
         List<String> midSkillList = new ArrayList<>(); //70-80%
         List<String> highSkillList = new ArrayList<>(); //大于80%
@@ -7,16 +7,26 @@ package com.jevon.enums;
  */
 public enum DifficultEnums {
-    easy(1,"易"),
-    medium(2,"中"),
-    difficult(3,"难");
+    easy(1,"易","认知"),
+    medium(2,"中","理解"),
+    difficult(3,"难","应用");
     private int difficultType ;
     private String difficultName ;
+    private String difficultShow ;
-    DifficultEnums(int difficultType, String difficultName) {
+    DifficultEnums(int difficultType, String difficultName, String difficultShow) {
         this.difficultType = difficultType;
         this.difficultName = difficultName;
+        this.difficultShow = difficultShow;
+    }
+
+    public String getDifficultShow() {
+        return difficultShow;
+    }
+
+    public void setDifficultShow(String difficultShow) {
+        this.difficultShow = difficultShow;
     }
     public int getDifficultType() {
@@ -17,6 +17,8 @@ public interface AnalyseDetailMapper {
     Double selectDifficult(AnalyseDetail analyseDetail);
+    Double selectSumType(AnalyseDetail analyseDetail);
+
     List<AnalyseDetail> selectDifficultDetail(AnalyseDetail analyseDetail);
     List<String> selectQuestionType(int analyseId);
@@ -18,4 +18,6 @@ public interface AnalyseMapper {
     Analyse selectById(int id);
     int update(Analyse analyse);
+
+    int updateChapter(Analyse analyse);
 }
@@ -0,0 +1,17 @@
+package com.jevon.mapper;
+
+import com.jevon.model.Chapter;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 9:04
+ */
+public interface ChapterMapper {
+
+    int insertBatch(List<Chapter> list);
+
+    List<Chapter> selectByAnalyse(int analyseId);
+}
@@ -16,6 +16,7 @@ public class Analyse {
     private Date createTime ;
     private Double maxScore ;
     private String grade ;
+    private String examScope ;
     public int getId() {
         return id;
@@ -72,4 +73,12 @@ public class Analyse {
     public void setGrade(String grade) {
         this.grade = grade;
     }
+
+    public String getExamScope() {
+        return examScope;
+    }
+
+    public void setExamScope(String examScope) {
+        this.examScope = examScope;
+    }
 }
@@ -0,0 +1,65 @@
+package com.jevon.model;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 9:03
+ */
+public class Chapter {
+
+    private int id ;
+    private int analyseId ;
+    private int chapterNumber ;
+    private String chapterName ;
+    private Double chapterScore ;
+
+    private Double percent ;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+
+    public int getChapterNumber() {
+        return chapterNumber;
+    }
+
+    public void setChapterNumber(int chapterNumber) {
+        this.chapterNumber = chapterNumber;
+    }
+
+    public String getChapterName() {
+        return chapterName;
+    }
+
+    public void setChapterName(String chapterName) {
+        this.chapterName = chapterName;
+    }
+
+    public Double getChapterScore() {
+        return chapterScore;
+    }
+
+    public void setChapterScore(Double chapterScore) {
+        this.chapterScore = chapterScore;
+    }
+
+    public Double getPercent() {
+        return percent;
+    }
+
+    public void setPercent(Double percent) {
+        this.percent = percent;
+    }
+}
@@ -17,6 +17,8 @@ public interface AnalyseDetailService {
     Double selectDifficult(int analyseId , int difficult);
+    Double selectSumType(int analyseId , String questionType);
+
     List<AnalyseDetail> selectDifficultDetail(int analyseId , int difficult);
     List<String> selectQuestionType(int analyseId);
@@ -18,4 +18,6 @@ public interface AnalyseService {
     Analyse selectById(int id);
     int update(Analyse analyse);
+
+    int updateChapter(int id , String examTime , String examScope);
 }
@@ -0,0 +1,17 @@
+package com.jevon.service;
+
+import com.jevon.model.Chapter;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 9:09
+ */
+public interface ChapterService {
+
+    int insertBatch(List<Chapter> list);
+
+    List<Chapter> selectByAnalyse(int analyseId);
+}
@@ -50,6 +50,14 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService {
     }
     @Override
+    public Double selectSumType(int analyseId, String questionType) {
+        AnalyseDetail analyseDetail = new AnalyseDetail();
+        analyseDetail.setQuestionType(questionType);
+        analyseDetail.setAnalyseId(analyseId);
+        return analyseDetailMapper.selectSumType(analyseDetail);
+    }
+
+    @Override
     public List<AnalyseDetail> selectDifficultDetail(int analyseId, int difficult) {
         AnalyseDetail analyseDetail = new AnalyseDetail();
         analyseDetail.setDifficult(difficult);
@@ -38,4 +38,13 @@ public class AnalyseServiceImpl implements AnalyseService {
     public int update(Analyse analyse) {
         return analyseMapper.update(analyse);
     }
+
+    @Override
+    public int updateChapter(int id, String examTime, String examScope) {
+        Analyse analyse = new Analyse();
+        analyse.setId(id);
+        analyse.setExamTime(examTime);
+        analyse.setExamScope(examScope);
+        return analyseMapper.updateChapter(analyse);
+    }
 }
@@ -0,0 +1,31 @@
+package com.jevon.service.impl;
+
+import com.jevon.mapper.ChapterMapper;
+import com.jevon.model.Chapter;
+import com.jevon.service.ChapterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 9:09
+ */
+@Service
+public class ChapterServiceImpl implements ChapterService {
+
+    @Autowired
+    ChapterMapper chapterMapper;
+
+    @Override
+    public int insertBatch(List<Chapter> list) {
+        return chapterMapper.insertBatch(list);
+    }
+
+    @Override
+    public List<Chapter> selectByAnalyse(int analyseId) {
+        return chapterMapper.selectByAnalyse(analyseId);
+    }
+}
@@ -44,25 +44,32 @@ public class LeagueServiceImpl implements LeagueService {
         League result = leagueMapper.selectById(id) ;
         League search = new League();
         search.setAnalyseId(result.getAnalyseId());
-        search.setLeague(result.getLeague());
-        List<League> list = leagueMapper.selectByLeague(search);
-        boolean isCreate = true ;
-        for(League temp : list){
-            if(StringUtils.isBlank(temp.getSchoolName())){
-                temp.setSchoolName(schoolName);
-                leagueMapper.update(temp);
-                isCreate = false;
-                break;
+        search.setSchoolName(schoolName);
+        List<League> leagues = leagueMapper.selectByLeague(search) ;
+        if(leagues != null & leagues.size() >0){
+            return 0 ;
+        }else {
+            search.setLeague(result.getLeague());
+            search.setSchoolName(null);
+            List<League> list = leagueMapper.selectByLeague(search);
+            boolean isCreate = true ;
+            for(League temp : list){
+                if(StringUtils.isBlank(temp.getSchoolName())){
+                    temp.setSchoolName(schoolName);
+                    leagueMapper.update(temp);
+                    isCreate = false;
+                    break;
+                }
             }
+            if(isCreate){
+                League createLeague = new League();
+                createLeague.setAnalyseId(result.getAnalyseId());
+                createLeague.setLeague(result.getLeague());
+                createLeague.setSchoolName(schoolName);
+                leagueMapper.insert(createLeague);
+            }
+            return 1;
         }
-        if(isCreate){
-            League createLeague = new League();
-            createLeague.setAnalyseId(result.getAnalyseId());
-            createLeague.setLeague(result.getLeague());
-            createLeague.setSchoolName(schoolName);
-            leagueMapper.insert(createLeague);
-        }
-        return 1;
     }
     @Override
@@ -0,0 +1,37 @@
+package com.jevon.vo.req;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 8:55
+ */
+public class ChapterReq {
+
+    private int chapterNumber ;
+    private String chapterName ;
+    private Double score ;
+
+    public int getChapterNumber() {
+        return chapterNumber;
+    }
+
+    public void setChapterNumber(int chapterNumber) {
+        this.chapterNumber = chapterNumber;
+    }
+
+    public String getChapterName() {
+        return chapterName;
+    }
+
+    public void setChapterName(String chapterName) {
+        this.chapterName = chapterName;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+}
@@ -0,0 +1,48 @@
+package com.jevon.vo.req;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 8:53
+ */
+public class ChapterReqVo {
+
+    private int analyseId ;
+    private String examTime ;
+    private String examScope ;
+    private List<ChapterReq> list ;
+
+    public int getAnalyseId() {
+        return analyseId;
+    }
+
+    public void setAnalyseId(int analyseId) {
+        this.analyseId = analyseId;
+    }
+
+    public String getExamTime() {
+        return examTime;
+    }
+
+    public void setExamTime(String examTime) {
+        this.examTime = examTime;
+    }
+
+    public String getExamScope() {
+        return examScope;
+    }
+
+    public void setExamScope(String examScope) {
+        this.examScope = examScope;
+    }
+
+    public List<ChapterReq> getList() {
+        return list;
+    }
+
+    public void setList(List<ChapterReq> list) {
+        this.list = list;
+    }
+}
@@ -0,0 +1,25 @@
+package com.jevon.wordDTO;
+
+import com.jevon.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/22 0022 10:51
+ */
+@ApiModel
+public class Form6RepVO extends BaseVo {
+
+    private List<Form6> data ;
+
+    public List<Form6> getData() {
+        return data;
+    }
+
+    public void setData(List<Form6> data) {
+        this.data = data;
+    }
+}
@@ -1,25 +0,0 @@
-package com.jevon.wordDTO;
-
-import com.jevon.vo.BaseVo;
-import io.swagger.annotations.ApiModel;
-
-import java.util.List;
-
-/**
- * @author chen
- * @version 1.0
- * @date 2019/10/22 0022 10:51
- */
-@ApiModel
-public class Form6RepVo extends BaseVo {
-
-    private List<Form6> data ;
-
-    public List<Form6> getData() {
-        return data;
-    }
-
-    public void setData(List<Form6> data) {
-        this.data = data;
-    }
-}
@@ -11,8 +11,17 @@ import io.swagger.annotations.ApiModel;
 public class Form7 {
     private String name ;
+    private Double score ;
     private Double percent ;
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
     public String getName() {
         return name;
     }
@@ -0,0 +1,67 @@
+package com.jevon.wordDTO;
+
+import com.jevon.model.Chapter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/24 0024 9:20
+ */
+@ApiModel
+public class Form7RepVO {
+
+    @ApiModelProperty(value = "举例七年级上册")
+    private String examScope ;
+    @ApiModelProperty(value = "科目")
+    private String courseName ;
+    @ApiModelProperty(value = "章节列表对应分值")
+    private List<Chapter> list ;
+    @ApiModelProperty(value = "难度列表对应分值")
+    private List<Form7> difficultList ;
+    @ApiModelProperty(value = "题型类型对应分值")
+    private List<Form7> typeList ;
+
+    public String getExamScope() {
+        return examScope;
+    }
+
+    public void setExamScope(String examScope) {
+        this.examScope = examScope;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public List<Chapter> getList() {
+        return list;
+    }
+
+    public void setList(List<Chapter> list) {
+        this.list = list;
+    }
+
+    public List<Form7> getDifficultList() {
+        return difficultList;
+    }
+
+    public void setDifficultList(List<Form7> difficultList) {
+        this.difficultList = difficultList;
+    }
+
+    public List<Form7> getTypeList() {
+        return typeList;
+    }
+
+    public void setTypeList(List<Form7> typeList) {
+        this.typeList = typeList;
+    }
+}
@@ -32,7 +32,10 @@
   </select>
   <select id="selectQuestionType" parameterType="java.lang.Integer" resultType="java.lang.String">
-    select DISTINCT questionType from sz_learn_analyse_detail where analyse_id = #{analyseId}
+    select DISTINCT question_type from sz_learn_analyse_detail where analyse_id = #{analyseId}
+  </select>
+
+  <select id="selectSumType" parameterType="com.jevon.model.AnalyseDetail" resultType="java.lang.Double">
+    select sum(score) from sz_learn_analyse_detail where analyse_id = #{analyseId} and question_type =#{questionType}
   </select>
-  
 </mapper>
 \ No newline at end of file
@@ -9,6 +9,7 @@
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="max_score" property="maxScore" jdbcType="FLOAT" />
     <result column="grade" property="grade" jdbcType="VARCHAR" />
+    <result column="exam_scope" property="examScope" jdbcType="VARCHAR" />
   </resultMap>
   <insert id="insert" parameterType="com.jevon.model.Analyse" useGeneratedKeys="true" keyProperty="id">
@@ -50,4 +51,8 @@
   <select id="selectById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select * from sz_learn_analyse where id = #{id}
   </select>
+
+  <update id="updateChapter" parameterType="com.jevon.model.Analyse" >
+    update sz_learn_analyse set exam_time = #{examTime} , exam_scope = #{examScope} where id  = #{id}
+  </update>
 </mapper>
 \ No newline at end of file
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.jevon.mapper.ChapterMapper" >
+  <resultMap id="BaseResultMap" type="com.jevon.model.Chapter" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="analyse_id" property="analyseId" jdbcType="INTEGER" />
+    <result column="chapter_number" property="chapterNumber" jdbcType="INTEGER" />
+    <result column="chapter_name" property="chapterName" jdbcType="VARCHAR" />
+    <result column="chapter_score" property="chapterScore" jdbcType="FLOAT" />
+  </resultMap>
+
+  <insert id="insertBatch" parameterType="com.jevon.model.Chapter" useGeneratedKeys="true" keyProperty="id">
+    insert into sz_learn_analyse_chapter (analyse_id, chapter_number,chapter_name,chapter_score)
+    values
+    <foreach collection="list" item="emp" separator=",">
+      (#{emp.analyseId}, #{emp.chapterNumber}, #{emp.chapterName}, #{emp.chapterScore})
+    </foreach>
+  </insert>
+
+  <select id="selectByAnalyse" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select * from sz_learn_analyse_chapter where analyse_id = #{analyseId}
+  </select>
+
+</mapper>
 \ No newline at end of file
	@@ -17,6 +17,8 @@ public interface AnalyseDetailMapper {		@@ -17,6 +17,8 @@ public interface AnalyseDetailMapper {
17		17
18	Double selectDifficult(AnalyseDetail analyseDetail);	18	Double selectDifficult(AnalyseDetail analyseDetail);
19		19
		20	+ Double selectSumType(AnalyseDetail analyseDetail);
		21	+
20	List<AnalyseDetail> selectDifficultDetail(AnalyseDetail analyseDetail);	22	List<AnalyseDetail> selectDifficultDetail(AnalyseDetail analyseDetail);
21		23
22	List<String> selectQuestionType(int analyseId);	24	List<String> selectQuestionType(int analyseId);
	@@ -18,4 +18,6 @@ public interface AnalyseMapper {		@@ -18,4 +18,6 @@ public interface AnalyseMapper {
18	Analyse selectById(int id);	18	Analyse selectById(int id);
19		19
20	int update(Analyse analyse);	20	int update(Analyse analyse);
		21	+
		22	+ int updateChapter(Analyse analyse);
21	}	23	}
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+package com.jevon.mapper;
	2	+
	3	+import com.jevon.model.Chapter;
	4	+
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * @author chen
	9	+ * @version 1.0
	10	+ * @date 2019/10/24 0024 9:04
	11	+ */
	12	+public interface ChapterMapper {
	13	+
	14	+ int insertBatch(List<Chapter> list);
	15	+
	16	+ List<Chapter> selectByAnalyse(int analyseId);
	17	+}
	@@ -16,6 +16,7 @@ public class Analyse {		@@ -16,6 +16,7 @@ public class Analyse {
16	private Date createTime ;	16	private Date createTime ;
17	private Double maxScore ;	17	private Double maxScore ;
18	private String grade ;	18	private String grade ;
		19	+ private String examScope ;
19		20
20	public int getId() {	21	public int getId() {
21	return id;	22	return id;
	@@ -72,4 +73,12 @@ public class Analyse {		@@ -72,4 +73,12 @@ public class Analyse {
72	public void setGrade(String grade) {	73	public void setGrade(String grade) {
73	this.grade = grade;	74	this.grade = grade;
74	}	75	}
		76	+
		77	+ public String getExamScope() {
		78	+ return examScope;
		79	+ }
		80	+
		81	+ public void setExamScope(String examScope) {
		82	+ this.examScope = examScope;
		83	+ }
75	}	84	}
@@ -0,0 +1,65 @@		@@ -0,0 +1,65 @@
	1	+package com.jevon.model;
	2	+
	3	+/**
	4	+ * @author chen
	5	+ * @version 1.0
	6	+ * @date 2019/10/24 0024 9:03
	7	+ */
	8	+public class Chapter {
	9	+
	10	+ private int id ;
	11	+ private int analyseId ;
	12	+ private int chapterNumber ;
	13	+ private String chapterName ;
	14	+ private Double chapterScore ;
	15	+
	16	+ private Double percent ;
	17	+
	18	+ public int getId() {
	19	+ return id;
	20	+ }
	21	+
	22	+ public void setId(int id) {
	23	+ this.id = id;
	24	+ }
	25	+
	26	+ public int getAnalyseId() {
	27	+ return analyseId;
	28	+ }
	29	+
	30	+ public void setAnalyseId(int analyseId) {
	31	+ this.analyseId = analyseId;
	32	+ }
	33	+
	34	+ public int getChapterNumber() {
	35	+ return chapterNumber;
	36	+ }
	37	+
	38	+ public void setChapterNumber(int chapterNumber) {
	39	+ this.chapterNumber = chapterNumber;
	40	+ }
	41	+
	42	+ public String getChapterName() {
	43	+ return chapterName;
	44	+ }
	45	+
	46	+ public void setChapterName(String chapterName) {
	47	+ this.chapterName = chapterName;
	48	+ }
	49	+
	50	+ public Double getChapterScore() {
	51	+ return chapterScore;
	52	+ }
	53	+
	54	+ public void setChapterScore(Double chapterScore) {
	55	+ this.chapterScore = chapterScore;
	56	+ }
	57	+
	58	+ public Double getPercent() {
	59	+ return percent;
	60	+ }
	61	+
	62	+ public void setPercent(Double percent) {
	63	+ this.percent = percent;
	64	+ }
	65	+}
	@@ -17,6 +17,8 @@ public interface AnalyseDetailService {		@@ -17,6 +17,8 @@ public interface AnalyseDetailService {
17		17
18	Double selectDifficult(int analyseId , int difficult);	18	Double selectDifficult(int analyseId , int difficult);
19		19
		20	+ Double selectSumType(int analyseId , String questionType);
		21	+
20	List<AnalyseDetail> selectDifficultDetail(int analyseId , int difficult);	22	List<AnalyseDetail> selectDifficultDetail(int analyseId , int difficult);
21		23
22	List<String> selectQuestionType(int analyseId);	24	List<String> selectQuestionType(int analyseId);
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+package com.jevon.service;
	2	+
	3	+import com.jevon.model.Chapter;
	4	+
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * @author chen
	9	+ * @version 1.0
	10	+ * @date 2019/10/24 0024 9:09
	11	+ */
	12	+public interface ChapterService {
	13	+
	14	+ int insertBatch(List<Chapter> list);
	15	+
	16	+ List<Chapter> selectByAnalyse(int analyseId);
	17	+}
	@@ -50,6 +50,14 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService {		@@ -50,6 +50,14 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService {
50	}	50	}
51		51
52	@Override	52	@Override
		53	+ public Double selectSumType(int analyseId, String questionType) {
		54	+ AnalyseDetail analyseDetail = new AnalyseDetail();
		55	+ analyseDetail.setQuestionType(questionType);
		56	+ analyseDetail.setAnalyseId(analyseId);
		57	+ return analyseDetailMapper.selectSumType(analyseDetail);
		58	+ }
		59	+
		60	+ @Override
53	public List<AnalyseDetail> selectDifficultDetail(int analyseId, int difficult) {	61	public List<AnalyseDetail> selectDifficultDetail(int analyseId, int difficult) {
54	AnalyseDetail analyseDetail = new AnalyseDetail();	62	AnalyseDetail analyseDetail = new AnalyseDetail();
55	analyseDetail.setDifficult(difficult);	63	analyseDetail.setDifficult(difficult);
	@@ -38,4 +38,13 @@ public class AnalyseServiceImpl implements AnalyseService {		@@ -38,4 +38,13 @@ public class AnalyseServiceImpl implements AnalyseService {
38	public int update(Analyse analyse) {	38	public int update(Analyse analyse) {
39	return analyseMapper.update(analyse);	39	return analyseMapper.update(analyse);
40	}	40	}
		41	+
		42	+ @Override
		43	+ public int updateChapter(int id, String examTime, String examScope) {
		44	+ Analyse analyse = new Analyse();
		45	+ analyse.setId(id);
		46	+ analyse.setExamTime(examTime);
		47	+ analyse.setExamScope(examScope);
		48	+ return analyseMapper.updateChapter(analyse);
		49	+ }
41	}	50	}
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+package com.jevon.service.impl;
	2	+
	3	+import com.jevon.mapper.ChapterMapper;
	4	+import com.jevon.model.Chapter;
	5	+import com.jevon.service.ChapterService;
	6	+import org.springframework.beans.factory.annotation.Autowired;
	7	+import org.springframework.stereotype.Service;
	8	+
	9	+import java.util.List;
	10	+
	11	+/**
	12	+ * @author chen
	13	+ * @version 1.0
	14	+ * @date 2019/10/24 0024 9:09
	15	+ */
	16	+@Service
	17	+public class ChapterServiceImpl implements ChapterService {
	18	+
	19	+ @Autowired
	20	+ ChapterMapper chapterMapper;
	21	+
	22	+ @Override
	23	+ public int insertBatch(List<Chapter> list) {
	24	+ return chapterMapper.insertBatch(list);
	25	+ }
	26	+
	27	+ @Override
	28	+ public List<Chapter> selectByAnalyse(int analyseId) {
	29	+ return chapterMapper.selectByAnalyse(analyseId);
	30	+ }
	31	+}