Commit bca34565e63def2f9e2a8b687da1f969532ef5e3
1 parent
bfc34c72
Exists in
master
临时微信入口
Showing
1 changed file
with
16 additions
and
13 deletions
Show diff stats
src/main/java/com/jevon/controller/LearnController.java
| @@ -72,26 +72,29 @@ public class LearnController { | @@ -72,26 +72,29 @@ public class LearnController { | ||
| 72 | 72 | ||
| 73 | @ApiOperation("获取详情,微信入口") | 73 | @ApiOperation("获取详情,微信入口") |
| 74 | @RequestMapping(value = "getDetail", method = RequestMethod.GET) | 74 | @RequestMapping(value = "getDetail", method = RequestMethod.GET) |
| 75 | - public Analyse getAnalyseId(String grade , String schoolName){ | ||
| 76 | - Analyse result = null ; | 75 | + public List<Analyse> getAnalyseId(String grade , String schoolName){ |
| 76 | + List<Analyse> result = new ArrayList<>(); | ||
| 77 | Analyse search = new Analyse(); | 77 | Analyse search = new Analyse(); |
| 78 | - search.setGrade(initGrade(grade,schoolName)); | ||
| 79 | - List<Analyse> analyseList = analyseService.select(search); | ||
| 80 | - if(analyseList != null && analyseList.size() > 0){ | ||
| 81 | - List<League> leagues = leagueService.selectByAnalyseId(analyseList.get(0).getId()); | ||
| 82 | - for(League league : leagues){ | ||
| 83 | - if(league.getSchoolName().equals(schoolName)){ | ||
| 84 | - result = analyseList.get(0); | ||
| 85 | - break; | 78 | + String[] msg = grade.split(","); |
| 79 | + for(String gradeMsg : msg){ | ||
| 80 | + search.setGrade(initGrade(gradeMsg,schoolName)); | ||
| 81 | + List<Analyse> analyseList = analyseService.select(search); | ||
| 82 | + if(analyseList != null && analyseList.size() > 0){ | ||
| 83 | + List<League> leagues = leagueService.selectByAnalyseId(analyseList.get(0).getId()); | ||
| 84 | + for(League league : leagues){ | ||
| 85 | + if(league.getSchoolName().equals(schoolName)){ | ||
| 86 | + result.add(analyseList.get(0)); | ||
| 87 | + break; | ||
| 88 | + } | ||
| 86 | } | 89 | } |
| 87 | } | 90 | } |
| 88 | } | 91 | } |
| 89 | - if(result == null){ | 92 | + if(result.size() == 0){ |
| 90 | Analyse searchAnalyse = new Analyse(); | 93 | Analyse searchAnalyse = new Analyse(); |
| 91 | searchAnalyse.setExamName("顺治中学模板考试"); | 94 | searchAnalyse.setExamName("顺治中学模板考试"); |
| 92 | - analyseList = analyseService.select(searchAnalyse); | 95 | + List<Analyse> analyseList = analyseService.select(searchAnalyse); |
| 93 | if(analyseList != null && analyseList.size() > 0){ | 96 | if(analyseList != null && analyseList.size() > 0){ |
| 94 | - result = analyseList.get(0); | 97 | + result.add(analyseList.get(0)); |
| 95 | } | 98 | } |
| 96 | } | 99 | } |
| 97 | return result ; | 100 | return result ; |