From bca34565e63def2f9e2a8b687da1f969532ef5e3 Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Wed, 6 Nov 2019 13:36:54 +0800
Subject: [PATCH] 临时微信入口

---
 src/main/java/com/jevon/controller/LearnController.java | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/jevon/controller/LearnController.java b/src/main/java/com/jevon/controller/LearnController.java
index fbe5158..1f74a69 100644
--- a/src/main/java/com/jevon/controller/LearnController.java
+++ b/src/main/java/com/jevon/controller/LearnController.java
@@ -72,26 +72,29 @@ public class LearnController {
 
     @ApiOperation("获取详情,微信入口")
     @RequestMapping(value = "getDetail", method = RequestMethod.GET)
-    public Analyse getAnalyseId(String grade , String schoolName){
-        Analyse result = null ;
+    public List<Analyse> getAnalyseId(String grade , String schoolName){
+        List<Analyse> result = new ArrayList<>();
         Analyse search = new Analyse();
-        search.setGrade(initGrade(grade,schoolName));
-        List<Analyse> analyseList = analyseService.select(search);
-        if(analyseList != null && analyseList.size() > 0){
-            List<League> leagues = leagueService.selectByAnalyseId(analyseList.get(0).getId());
-            for(League league : leagues){
-                if(league.getSchoolName().equals(schoolName)){
-                    result = analyseList.get(0);
-                    break;
+        String[] msg = grade.split(",");
+        for(String gradeMsg : msg){
+            search.setGrade(initGrade(gradeMsg,schoolName));
+            List<Analyse> analyseList = analyseService.select(search);
+            if(analyseList != null && analyseList.size() > 0){
+                List<League> leagues = leagueService.selectByAnalyseId(analyseList.get(0).getId());
+                for(League league : leagues){
+                    if(league.getSchoolName().equals(schoolName)){
+                        result.add(analyseList.get(0));
+                        break;
+                    }
                 }
             }
         }
-        if(result == null){
+        if(result.size() == 0){
             Analyse searchAnalyse = new Analyse();
             searchAnalyse.setExamName("顺治中学模板考试");
-            analyseList = analyseService.select(searchAnalyse);
+            List<Analyse> analyseList = analyseService.select(searchAnalyse);
             if(analyseList != null && analyseList.size() > 0){
-                result = analyseList.get(0);
+                result.add(analyseList.get(0));
             }
         }
         return  result ;
--
libgit2 0.21.0