Browse Source

添加驾驶舱学生画像中的学期分组

liu 2 years ago
parent
commit
342c01e457

+ 1 - 1
src/main/java/com/template/api/SmartScoreControllerAPI.java

@@ -109,7 +109,7 @@ public interface SmartScoreControllerAPI {
 
 
     @GetMapping(value = "/averageScore")
     @GetMapping(value = "/averageScore")
     @ApiOperation(value = "各科成绩的平均分", notes = "各科成绩的平均分", httpMethod = "GET")
     @ApiOperation(value = "各科成绩的平均分", notes = "各科成绩的平均分", httpMethod = "GET")
-    CommonResult averageScore(@RequestParam int userId);
+    CommonResult averageScore(@RequestParam int userId,@RequestParam int semesterId);
 
 
     @GetMapping(value = "/teacherMessage")
     @GetMapping(value = "/teacherMessage")
     @ApiOperation(value = "老师寄语", notes = "老师寄语", httpMethod = "GET")
     @ApiOperation(value = "老师寄语", notes = "老师寄语", httpMethod = "GET")

+ 7 - 0
src/main/java/com/template/api/SmartSemesterControllerAPI.java

@@ -37,4 +37,11 @@ public interface SmartSemesterControllerAPI {
     @GetMapping(value = "/deleteSmartSemesterById")
     @GetMapping(value = "/deleteSmartSemesterById")
     @ApiOperation(value = "根据ID删除指定学期", notes = "根据ID删除指定学期", httpMethod = "GET")
     @ApiOperation(value = "根据ID删除指定学期", notes = "根据ID删除指定学期", httpMethod = "GET")
     CommonResult deleteSmartSemesterById(@RequestParam int id);
     CommonResult deleteSmartSemesterById(@RequestParam int id);
+
+    @GetMapping(value = "/getSmartSemester")
+    @ApiOperation(value = "展示学期数据", notes = "展示学期数据", httpMethod = "GET")
+    CommonResult getSmartSemester();
+
+
+
 }
 }

+ 8 - 7
src/main/java/com/template/controller/SmartScoreController.java

@@ -877,13 +877,14 @@ public class SmartScoreController implements SmartScoreControllerAPI {
 
 
     @Override
     @Override
     @DESRespondSecret(validated = true)
     @DESRespondSecret(validated = true)
-    public CommonResult averageScore(int userId) {
-        LocalDateTime now = LocalDateTime.now();
-        SmartSemester smartSemester = smartSemesterService.getSemester(now);
-        if (ObjectUtils.isEmpty(smartSemester)) {
-            return CommonResult.ok("当前时间不属于任何学期");
-        }
-        Integer semesterId = smartSemester.getId();
+    public CommonResult averageScore(int userId,int semesterId) {
+//        LocalDateTime now = LocalDateTime.now();
+//        SmartSemester smartSemester = smartSemesterService.getSemester(now);
+//        if (ObjectUtils.isEmpty(smartSemester)) {
+//            return CommonResult.ok("当前时间不属于任何学期");
+//        }
+//
+//        Integer semesterId = smartSemester.getId();
 //        获取所有学科
 //        获取所有学科
         List<SmartSubject> list = smartSubjectService.list(new LambdaQueryWrapper<>());
         List<SmartSubject> list = smartSubjectService.list(new LambdaQueryWrapper<>());
         ArrayList<AverageScoreVo> averageScoreVos = new ArrayList<>();
         ArrayList<AverageScoreVo> averageScoreVos = new ArrayList<>();

+ 14 - 0
src/main/java/com/template/controller/SmartSemesterController.java

@@ -1,6 +1,8 @@
 package com.template.controller;
 package com.template.controller;
 
 
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.template.annotation.DESRespondSecret;
 import com.template.annotation.DESRespondSecret;
 import com.template.api.SmartSemesterControllerAPI;
 import com.template.api.SmartSemesterControllerAPI;
 import com.template.common.utils.paramUtils;
 import com.template.common.utils.paramUtils;
@@ -542,5 +544,17 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
     }
 
 
+    @Override
+    @DESRespondSecret(validated = true)
+    public CommonResult getSmartSemester() {
+
+        LambdaQueryWrapper<SmartSemester> wrapper=new LambdaQueryWrapper<>();
+        wrapper.orderByDesc(SmartSemester::getStartTime);
+
+        List<SmartSemester> list = smartSemesterService.list(wrapper);
+
+        return CommonResult.ok(list);
+    }
+
 }
 }