Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/api/SmartEvaluateTeacherControllerAPI.java

@@ -45,6 +45,6 @@ public interface SmartEvaluateTeacherControllerAPI {
 
     @RequestMapping(value = "/getScoreRank")
     @ApiOperation(value = "评分排行", httpMethod = "POST")
-    public CommonResult getScoreRank(int currentPage, int pageCount,String scoreItem);
+    public CommonResult getScoreRank(int currentPage, int pageCount,String subject);
 
 }

src/main/java/com/template/controller/SmartEvaluateTeacherController.java

@@ -329,15 +329,15 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
     }
 
     @PassToken
-    public CommonResult getScoreRank(int currentPage, int pageCount,String scoreItem){
-        QueryWrapper<SmartEvaluateTdetail> queryWrapper1 = new QueryWrapper<>();
+    public CommonResult getScoreRank(int currentPage, int pageCount,String subject){
+        QueryWrapper<SmartEvaluateTeacher> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("term", smartScoreManageService.getMaxTerm());
-        queryWrapper1.eq("parent_id", 0);
-        if (scoreItem!=null){
-            queryWrapper1.eq("score_item", scoreItem);
+        queryWrapper1.eq("deleted", 0);
+        if (subject!=null){
+            queryWrapper1.eq("subject", subject);
         }
-        queryWrapper1.orderByDesc("own_num");
-        PageUtils<SmartEvaluateTdetail> list = smartEvaluateTdetailService.queryPageSmartEvaluateTdetail(currentPage,pageCount,queryWrapper1);
+        queryWrapper1.orderByDesc("total_score");
+        PageUtils<SmartEvaluateTeacher> list = smartEvaluateTeacherService.queryPageSmartEvaluateTeacher(currentPage,pageCount,queryWrapper1);
         return CommonResult.ok(list);
     }
 }