From 583a03d5daf88bf4896bc78540a2820599937b9d Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Wed, 6 Nov 2019 08:46:50 +0800
Subject: [PATCH] 临时微信入口

---
 src/main/java/com/jevon/controller/LearnController.java     | 28 ++++++++++++++++++++++++++++
 src/main/java/com/jevon/controller/LearnStatController.java | 40 +++++++++++++++++++++++++++++++++++-----
 src/main/resources/mapping/AnalyseMapper.xml                |  3 +++
 src/main/resources/mapping/KnowledgeMapper.xml              |  2 +-
 4 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/jevon/controller/LearnController.java b/src/main/java/com/jevon/controller/LearnController.java
index cfc769d..89b2429 100644
--- a/src/main/java/com/jevon/controller/LearnController.java
+++ b/src/main/java/com/jevon/controller/LearnController.java
@@ -70,6 +70,34 @@ public class LearnController {
         return  list;
     }
 
+    @ApiOperation("获取详情,微信入口")
+    @RequestMapping(value = "getDetail", method = RequestMethod.GET)
+    public Analyse getAnalyseId(String grade , String schoolName){
+        Analyse result = null ;
+        Analyse search = new Analyse();
+        search.setGrade(grade);
+        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;
+                }
+            }
+        }
+        if(result == null){
+            Analyse searchAnalyse = new Analyse();
+            searchAnalyse.setExamName("顺治中学模板考试");
+            analyseList = analyseService.select(searchAnalyse);
+            if(analyseList != null && analyseList.size() > 0){
+                result = analyseList.get(0);
+            }
+        }
+
+        return  result ;
+    }
+
     @ApiOperation("创建考试")
     @RequestMapping(value = "createExam", method = RequestMethod.POST)
     public BaseVo createExam(@RequestBody CreateExamReqVo createExamReqVo){
diff --git a/src/main/java/com/jevon/controller/LearnStatController.java b/src/main/java/com/jevon/controller/LearnStatController.java
index 4ed7a04..55bed6c 100644
--- a/src/main/java/com/jevon/controller/LearnStatController.java
+++ b/src/main/java/com/jevon/controller/LearnStatController.java
@@ -626,14 +626,44 @@ public class LearnStatController {
                 table2List.add(table2);
             }
         }
-        List<Table2> data = new ArrayList<>();
-        for(Table2 table2 : table2List){
+        List<Table2> data = sort(table2List);
+        table2RepVO.setData(data);
+        return table2RepVO;
+    }
+
+    private List<Table2> sort(List<Table2> target){
+        List<Table2> course = new ArrayList<>();
+        for(Table2 table2 : target){
             if(table2.getSchoolRate() < 0.75 && Double.valueOf(table2.getAvg()) >2){
-                data.add(table2);
+                course.add(table2);
             }
         }
-        table2RepVO.setData(data);
-        return table2RepVO;
+        if(course.size() == 0){
+            Double avg = new Double("0");
+            Table2 result = new Table2();
+            for(Table2 table2 : target){
+                if(avg < new Double(table2.getAvg())){
+                    avg = new Double(table2.getAvg()) ;
+                    result = table2 ;
+                }
+            }
+            course.add(result);
+        }
+
+        if(course.size() > 5){
+            course = course.subList(0,5);
+        }
+        for (int i = 0; i < course.size() ; i++) {
+            Table2 temp = new Table2();
+            for (int j = 0; j < course.size() ; j++) {
+                if(new Double(course.get(i).getAvg()) > new Double(course.get(j).getAvg())){
+                    temp = course.get(j);
+                    course.set(j,course.get(i));
+                    course.set(i,temp);
+                }
+            }
+        }
+        return course;
     }
 
     @ApiOperation("getForm3_2")
diff --git a/src/main/resources/mapping/AnalyseMapper.xml b/src/main/resources/mapping/AnalyseMapper.xml
index 88917a7..3159514 100644
--- a/src/main/resources/mapping/AnalyseMapper.xml
+++ b/src/main/resources/mapping/AnalyseMapper.xml
@@ -45,6 +45,9 @@
       <if test="examName != null">
         and exam_name = #{examName}
       </if>
+      <if test="grade != null">
+       and grade = #{grade}
+      </if>
     </where>
   </select>
 
diff --git a/src/main/resources/mapping/KnowledgeMapper.xml b/src/main/resources/mapping/KnowledgeMapper.xml
index 51ae424..8c8c6b4 100644
--- a/src/main/resources/mapping/KnowledgeMapper.xml
+++ b/src/main/resources/mapping/KnowledgeMapper.xml
@@ -23,7 +23,7 @@
   </select>
 
   <select id="selectAll"  resultMap="BaseResultMap">
-    select * from sz_learn_knowledge
+    select * from sz_learn_knowledge order by knowledge_avg desc
   </select>
 
 </mapper>
\ No newline at end of file
--
libgit2 0.21.0