新增我的考试分析

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/SurveyTeacherViewResult.java

@@ -26,6 +26,9 @@ public class SurveyTeacherViewResult implements Serializable {
     @ApiModelProperty(value = "开课学院考试概况")
     private TeachCourseSurveyResult teachCourseSurveyResult;
 
+    @ApiModelProperty(value = "我的课堂考试概况")
+    private TeachCourseResult teachCourseResult;
+
     public SurveyTeacherViewResult() {
 
     }
@@ -37,6 +40,13 @@ public class SurveyTeacherViewResult implements Serializable {
         this.teachCourseSurveyResult = teachCourseSurveyResult;
     }
 
+    public SurveyTeacherViewResult(QuestionListResult questionInfo, SurveyTeacherExamCourseResult surveyTeacher, TeachCourseSurveyResult teachCourseSurveyResult, TeachCourseResult teachCourseResult) {
+        this.questionInfo = questionInfo;
+        this.surveyTeacher = surveyTeacher;
+        this.teachCourseSurveyResult = teachCourseSurveyResult;
+        this.teachCourseResult = teachCourseResult;
+    }
+
     public List<SurveyTeacherGradeDistributionResult> getGradeDistribution() {
         return gradeDistribution;
     }
@@ -68,4 +78,12 @@ public class SurveyTeacherViewResult implements Serializable {
     public void setTeachCourseSurveyResult(TeachCourseSurveyResult teachCourseSurveyResult) {
         this.teachCourseSurveyResult = teachCourseSurveyResult;
     }
+
+    public TeachCourseResult getTeachCourseResult() {
+        return teachCourseResult;
+    }
+
+    public void setTeachCourseResult(TeachCourseResult teachCourseResult) {
+        this.teachCourseResult = teachCourseResult;
+    }
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TeachCourseResult.java

@@ -0,0 +1,59 @@
+package com.qmth.teachcloud.report.business.bean.result;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * @Description: 我的考试课堂分析 - 图表查询接口
+ * @Author: CaoZixuan
+ * @Date: 2021-06-19
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TeachCourseResult extends TeachCourseSurveyResult {
+
+    @ApiModelProperty(value = "课堂有效实考人数")
+    private int courseRealityCount;
+
+    @ApiModelProperty(value = "课堂缺考人数")
+    private int courseAbsentCount;
+
+    @ApiModelProperty(value = "人数")
+    private int recordAbsentCount;
+
+    @ApiModelProperty(value = "是否缺考 1缺考 0正常")
+    private Boolean absent;
+
+    public int getRecordAbsentCount() {
+        return recordAbsentCount;
+    }
+
+    public void setRecordAbsentCount(int recordAbsentCount) {
+        this.recordAbsentCount = recordAbsentCount;
+    }
+
+    public Boolean getAbsent() {
+        return absent;
+    }
+
+    public void setAbsent(Boolean absent) {
+        this.absent = absent;
+    }
+
+    public int getCourseRealityCount() {
+        return courseRealityCount;
+    }
+
+    public void setCourseRealityCount(int courseRealityCount) {
+        this.courseRealityCount = courseRealityCount;
+    }
+
+    public int getCourseAbsentCount() {
+        return courseAbsentCount;
+    }
+
+    public void setCourseAbsentCount(int courseAbsentCount) {
+        this.courseAbsentCount = courseAbsentCount;
+    }
+}

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

@@ -115,4 +115,15 @@ public interface ReportCommonService {
      * @return
      */
     TeachCourseSurveyResult getTeachCourseSurveyInfo(SemesterEnum semester, Long examId, String courseCode);
+
+    /**
+     * 获取我的课堂考试分析考试概况
+     *
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param inspectCollegeId
+     * @return
+     */
+    TeachCourseResult getTeachCourseInfo(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId);
 }

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

@@ -591,4 +591,19 @@ public class ReportCommonServiceImpl implements ReportCommonService {
         teachCourseSurveyResult.setInspectCollegeNames(taExamCourse.getInspectCollegeNames());
         return teachCourseSurveyResult;
     }
+
+    /**
+     * 获取我的课堂考试分析考试概况
+     *
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param inspectCollegeId
+     * @return
+     */
+    @Override
+    public TeachCourseResult getTeachCourseInfo(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId) {
+//        taExamCourseCollegeInspectService.getOne();
+        return null;
+    }
 }

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

@@ -77,7 +77,7 @@ public class TAExamCourseCollegeTeacherController {
                               @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 = false) @RequestParam(required = false) String inspectCollegeId) {
+                              @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));
     }