From 32666b061f00979431e011c5569d4f9327b7fc29 Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Mon, 28 Oct 2019 08:21:09 +0800
Subject: [PATCH] 1

---
 src/main/java/com/jevon/controller/LearnController.java     | 6 ++++++
 src/main/java/com/jevon/controller/LearnStatController.java | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

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<String> 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<String> 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