Commit 32666b061f00979431e011c5569d4f9327b7fc29
1 parent
c2cd651b
Exists in
master
1
Showing
2 changed files
with
13 additions
and
1 deletions
Show diff stats
src/main/java/com/jevon/controller/LearnController.java
| @@ -368,4 +368,10 @@ public class LearnController { | @@ -368,4 +368,10 @@ public class LearnController { | ||
| 368 | chapterService.insertBatch(list); | 368 | chapterService.insertBatch(list); |
| 369 | return baseVo; | 369 | return baseVo; |
| 370 | } | 370 | } |
| 371 | + | ||
| 372 | + @ApiOperation("获取导入的学校列表") | ||
| 373 | + @RequestMapping(value = "getSchoolName", method = RequestMethod.GET) | ||
| 374 | + public List<String> getSchoolName(int analyseId){ | ||
| 375 | + return studentService.selectSchoolNameByAnalyse(analyseId); | ||
| 376 | + } | ||
| 371 | } | 377 | } |
src/main/java/com/jevon/controller/LearnStatController.java
| @@ -624,7 +624,13 @@ public class LearnStatController { | @@ -624,7 +624,13 @@ public class LearnStatController { | ||
| 624 | List<String> examNumberList = new ArrayList<>(); | 624 | List<String> examNumberList = new ArrayList<>(); |
| 625 | for(AnalyseDimensional analyseDimensional :analyseDimensionals){ | 625 | for(AnalyseDimensional analyseDimensional :analyseDimensionals){ |
| 626 | score = score + analyseDimensional.getScore() ; | 626 | score = score + analyseDimensional.getScore() ; |
| 627 | - examNumber.append(analyseDimensional.getQuestionNumber()).append(","); | 627 | + String questionNumber = analyseDimensional.getQuestionNumber(); |
| 628 | + if(questionNumber.contains("(")){ | ||
| 629 | + questionNumber = questionNumber.split("\\(")[0]; | ||
| 630 | + } | ||
| 631 | + if(!examNumber.toString().contains(questionNumber)){ | ||
| 632 | + examNumber.append(questionNumber).append(","); | ||
| 633 | + } | ||
| 628 | examNumberList.add(analyseDimensional.getQuestionNumber()); | 634 | examNumberList.add(analyseDimensional.getQuestionNumber()); |
| 629 | } | 635 | } |
| 630 | Double allSumScore = studentDetailService.selectSumScore(analyse.getId(),null,null,examNumberList); | 636 | Double allSumScore = studentDetailService.selectSumScore(analyse.getId(),null,null,examNumberList); |