新增entity

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/TAExamCourseCollegeTeacherService.java

@@ -2,10 +2,7 @@ package com.qmth.teachcloud.report.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.report.business.bean.result.SurveyTeacherViewResult;
-import com.qmth.teachcloud.report.business.bean.result.TAExamCourseTeacherResult;
-import com.qmth.teachcloud.report.business.bean.result.TeacherClassRankResult;
-import com.qmth.teachcloud.report.business.bean.result.TeacherMyClassRankResult;
+import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
@@ -41,7 +38,7 @@ public interface TAExamCourseCollegeTeacherService extends IService<TAExamCourse
     IPage<TeacherClassRankResult> listTeacherClassRank(SemesterEnum semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
     /**
-     * 我的课堂考试分析图表接口
+     * 我的课堂考试分析-图表接口
      *
      * @param schoolId
      * @param semester
@@ -51,4 +48,28 @@ public interface TAExamCourseCollegeTeacherService extends IService<TAExamCourse
      * @return
      */
     SurveyTeacherViewResult teacherView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId);
+
+    /**
+     * 我的课堂考试分析-试题难度得分情况分析接口
+     *
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param collegeId
+     * @return
+     */
+    DimensionAnalyzeResult teacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId);
+
+    /**
+     * 我的课堂考试分析-各难度水平题目上的作答分析接口
+     *
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param collegeId
+     * @return
+     */
+    QuestionInfoResult teacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId);
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TAExamCourseCollegeTeacherServiceImpl.java

@@ -96,7 +96,7 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
     }
 
     /**
-     * 我的课堂考试分析图表接口
+     * 我的课堂考试分析-图表接口
      *
      * @param schoolId
      * @param semester
@@ -115,4 +115,34 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
         QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, inspectCollegeId);
         return new SurveyTeacherViewResult(null, questionListResult, surveyTeacherExamCourseResult, teachCourseSurveyResult);
     }
+
+    /**
+     * 我的课堂考试分析-试题难度得分情况分析接口
+     *
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param collegeId
+     * @return
+     */
+    @Override
+    public DimensionAnalyzeResult teacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId) {
+        return reportCommonService.findDimensionInfo(examId, courseCode, collegeId, null);
+    }
+
+    /**
+     * 我的课堂考试分析-各难度水平题目上的作答分析接口
+     *
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param collegeId
+     * @return
+     */
+    @Override
+    public QuestionInfoResult teacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId) {
+        return reportCommonService.findSituationOfQuestions(examId, courseCode, collegeId, null);
+    }
 }

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TAExamCourseCollegePaperStructController.java

@@ -1,19 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 教师考察学院下试卷结构维度分析表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-07-20
- */
-@RestController
-@RequestMapping("/t-aexam-course-college-paper-struct")
-public class TAExamCourseCollegePaperStructController {
-
-}

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TAExamCourseCollegeTeacherController.java

@@ -70,14 +70,36 @@ public class TAExamCourseCollegeTeacherController {
         return ResultUtil.ok(taExamCourseCollegeTeacherService.listMyClassRank(semester, examId, courseCode, inspectCollegeId, pageNumber, pageSize, column, order));
     }
 
-    @ApiOperation(value = "我的课堂考试分析图表接口")
+    @ApiOperation(value = "我的课堂考试分析-图表接口")
     @RequestMapping(value = "/teacher/view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = SurveyTeacherViewResult.class)})
-    public Result surveyTeacherView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                    @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
-                                    @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
-                                    @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                                    @ApiParam(value = "考查学院id", required = true) @RequestParam String inspectCollegeId) {
+    public Result teacherView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
+                              @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                              @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
+                              @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+                              @ApiParam(value = "考查学院id", required = true) @RequestParam String inspectCollegeId) {
         return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(inspectCollegeId) ? SystemConstant.convertIdToLong(inspectCollegeId) : null));
     }
+
+    @ApiOperation(value = "我的课堂考试分析-试题难度得分情况分析接口")
+    @RequestMapping(value = "/teacher/question_view", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = SurveyTeacherViewResult.class)})
+    public Result teacherQuestionView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
+                                      @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                      @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
+                                      @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+                                      @ApiParam(value = "学院id", required = true) @RequestParam String collegeId) {
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : null));
+    }
+
+    @ApiOperation(value = "我的课堂考试分析-各难度水平题目上的作答分析接口")
+    @RequestMapping(value = "/teacher/question_answer_view", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = SurveyTeacherViewResult.class)})
+    public Result teacherQuestionAnswerView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
+                                            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                            @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
+                                            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+                                            @ApiParam(value = "学院id", required = true) @RequestParam String collegeId) {
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : null));
+    }
 }

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TAExamCourseTeacherCollegeDifficultController.java

@@ -1,19 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 授课教师-本院难度分布和该教师在本院难度分布对比 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-07-20
- */
-@RestController
-@RequestMapping("/t-aexam-course-teacher-college-difficult")
-public class TAExamCourseTeacherCollegeDifficultController {
-
-}

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TAExamCourseTeacherCollegeDioController.java

@@ -1,19 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 各个教师在考察学院下的各考察点得分情况表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-07-20
- */
-@RestController
-@RequestMapping("/t-aexam-course-teacher-college-dio")
-public class TAExamCourseTeacherCollegeDioController {
-
-}

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TAExamCourseTeacherCollegePaperStructController.java

@@ -1,19 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 教师考察学院下试卷结构维度分析表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-07-20
- */
-@RestController
-@RequestMapping("/t-aexam-course-teacher-college-paper-struct")
-public class TAExamCourseTeacherCollegePaperStructController {
-
-}

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TAExamCourseTeacherPaperStructController.java

@@ -1,19 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 教师下试卷结构维度分析表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-07-20
- */
-@RestController
-@RequestMapping("/t-aexam-course-teacher-paper-struct")
-public class TAExamCourseTeacherPaperStructController {
-
-}