Просмотр исходного кода

老师接口的老师应该传老师id,不用师用户id

mingfu 4 недель назад
Родитель
Сommit
25f6ffc2b9

+ 14 - 11
ie-admin/src/main/java/com/ruoyi/web/controller/learn/LearnTeacherController.java

@@ -103,7 +103,7 @@ public class LearnTeacherController extends BaseController {
     @ApiOperation("班级生成统计")
     public AjaxResult classStatistic(TestPaperVO.TestPaperBuildReq req)
     {
-        return AjaxResult.success(learnTeacherService.getClassesBuildStats(req, SecurityUtils.getLoginUser().getUser().getUserTypeId()));
+        return AjaxResult.success(learnTeacherService.getClassesBuildStats(req, getTeacherId()));
     }
 
 
@@ -190,10 +190,14 @@ public class LearnTeacherController extends BaseController {
         req.setBuildType("ExactIntelligent");
         req.setDirectType(true);
         req.setSubjectId(11L);
-        req.setTeacherId(SecurityUtils.getUserId());
+        req.setTeacherId(getTeacherId());
         return AjaxResult.success(learnTeacherService.buildPapersDirect(req));
     }
 
+    private Long getTeacherId() {
+        return SecurityUtils.getLoginUser().getUser().getUserTypeId();
+    }
+
     @PreAuthorize("@ss.hasPermi('learn:test_paper:add')")
     @PostMapping("/build/fullIntelligent")
     @ApiOperation("全量智能")
@@ -204,7 +208,7 @@ public class LearnTeacherController extends BaseController {
         if(null == req.getSubjectId()) {
             AjaxResult.error("未选择科目");
         }
-        req.setTeacherId(SecurityUtils.getUserId());
+        req.setTeacherId(getTeacherId());
         return AjaxResult.success(learnTeacherService.buildPapersFull(req));
     }
 
@@ -219,7 +223,7 @@ public class LearnTeacherController extends BaseController {
         if(null == req.getMajorPlanId()) {
             AjaxResult.error("未选择计划");
         }
-        req.setTeacherId(SecurityUtils.getUserId());
+        req.setTeacherId(getTeacherId());
         return AjaxResult.success(learnTeacherService.buildPapersDirect(req));
     }
 
@@ -233,7 +237,7 @@ public class LearnTeacherController extends BaseController {
         if(null == req.getSubjectId()) {
             AjaxResult.error("未选择科目");
         }
-        req.setTeacherId(SecurityUtils.getUserId());
+        req.setTeacherId(getTeacherId());
         return AjaxResult.success(learnTeacherService.buildPapersFull(req));
     }
 
@@ -241,7 +245,7 @@ public class LearnTeacherController extends BaseController {
     @ApiOperation("院校列表")
     public AjaxResult universities(@ApiParam("批次ID") Long batchId)
     {
-        return AjaxResult.success(learnTeacherService.selectUniversityList(getUserId(), batchId));
+        return AjaxResult.success(learnTeacherService.selectUniversityList(getTeacherId(), batchId));
     }
 
     @GetMapping("/majors")
@@ -285,26 +289,25 @@ public class LearnTeacherController extends BaseController {
     @ApiOperation("2. 班级列表")
     public AjaxResult classes()
     {
-        return AjaxResult.success(learnTeacherService.getClasses(SecurityUtils.getLoginUser().getUser().getUserTypeId()));
+        return AjaxResult.success(learnTeacherService.getClasses(getTeacherId()));
     }
 
     @GetMapping("/students")
     @ApiOperation("学生列表")
-    public AjaxResult students(@ApiParam("批次ID") Long batchId)
+    public AjaxResult students(@ApiParam("批次ID") Long batchId, @ApiParam("班级ID") Long classId)
     {
-        return AjaxResult.success(learnTeacherService.getStudents(batchId, getUserId()));
+        return AjaxResult.success(learnTeacherService.getStudents(batchId, classId));
     }
 
     @ApiOperation("04 取试卷列表")
     @GetMapping(value = "papers")
     public AjaxResult papers(@ApiParam("批次") @RequestParam(required = false) Integer batchId) {
         LearnTestPaper tpCond = new LearnTestPaper();
-        tpCond.setCreatorId(SecurityUtils.getUserId());
+        tpCond.setCreatorId(getTeacherId());
         tpCond.setBatchId(batchId);
         List<LearnTestPaper> testPaperList = testPaperService.selectLearnTestPaperList(tpCond);
         List<LearnPaper> paperList = Lists.newArrayList();
         for(LearnTestPaper tp : testPaperList) {
-            JSONObject root = JSONObject.from(tp);
             paperList.add(learnPaperService.selectLearnPaperById(tp.getPaperId()));
         }
         return AjaxResult.success(paperList);