diff --git a/src/main/java/com/jevon/controller/LearnController.java b/src/main/java/com/jevon/controller/LearnController.java index c574dbe..aaea4d9 100644 --- a/src/main/java/com/jevon/controller/LearnController.java +++ b/src/main/java/com/jevon/controller/LearnController.java @@ -368,4 +368,10 @@ public class LearnController { chapterService.insertBatch(list); return baseVo; } + + @ApiOperation("获取导入的学校列表") + @RequestMapping(value = "getSchoolName", method = RequestMethod.GET) + public List getSchoolName(int analyseId){ + return studentService.selectSchoolNameByAnalyse(analyseId); + } } diff --git a/src/main/java/com/jevon/controller/LearnStatController.java b/src/main/java/com/jevon/controller/LearnStatController.java index 00f1617..9665ae8 100644 --- a/src/main/java/com/jevon/controller/LearnStatController.java +++ b/src/main/java/com/jevon/controller/LearnStatController.java @@ -624,7 +624,13 @@ public class LearnStatController { List examNumberList = new ArrayList<>(); for(AnalyseDimensional analyseDimensional :analyseDimensionals){ score = score + analyseDimensional.getScore() ; - examNumber.append(analyseDimensional.getQuestionNumber()).append(","); + String questionNumber = analyseDimensional.getQuestionNumber(); + if(questionNumber.contains("(")){ + questionNumber = questionNumber.split("\\(")[0]; + } + if(!examNumber.toString().contains(questionNumber)){ + examNumber.append(questionNumber).append(","); + } examNumberList.add(analyseDimensional.getQuestionNumber()); } Double allSumScore = studentDetailService.selectSumScore(analyse.getId(),null,null,examNumberList); -- libgit2 0.21.0