新增我的考试分析

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

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * @Description: 我的考试课堂分析 - 图表查询接口
@@ -14,13 +16,10 @@ import java.math.BigDecimal;
 public class TeachCourseResult extends TeachCourseSurveyResult {
 
     @ApiModelProperty(value = "课堂有效实考人数")
-    private int courseRealityCount;
+    private int courseRealityCount = 0;
 
     @ApiModelProperty(value = "课堂缺考人数")
-    private int courseAbsentCount;
-
-    @ApiModelProperty(value = "人数")
-    private int recordAbsentCount;
+    private int courseAbsentCount = 0;
 
     @ApiModelProperty(value = "是否缺考 1缺考 0正常")
     private Boolean absent;
@@ -38,14 +37,6 @@ public class TeachCourseResult extends TeachCourseSurveyResult {
         setAbsentCount(taExamCourseCollegeInspectResult.getAbsentCount());
     }
 
-    public int getRecordAbsentCount() {
-        return recordAbsentCount;
-    }
-
-    public void setRecordAbsentCount(int recordAbsentCount) {
-        this.recordAbsentCount = recordAbsentCount;
-    }
-
     public Boolean getAbsent() {
         return absent;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TAExamCourseRecordMapper.java

@@ -1,11 +1,9 @@
 package com.qmth.teachcloud.report.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.teachcloud.report.business.bean.result.ExamRecordResult;
-import com.qmth.teachcloud.report.business.bean.result.ExamStudentResult;
-import com.qmth.teachcloud.report.business.bean.result.SurveyTeacherDistributionResult;
-import com.qmth.teachcloud.report.business.bean.result.SynthesisResult;
+import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseRecord;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -44,4 +42,17 @@ public interface TAExamCourseRecordMapper extends BaseMapper<TAExamCourseRecord>
      * @return
      */
     List<SurveyTeacherDistributionResult> surveyTeacherDistribution(@Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("filter") boolean filter);
+
+    /**
+     * 我的课堂考试分析-考试概况，查找我的课堂数据
+     *
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param inspectCollegeId
+     * @param teacherId
+     * @return
+     */
+    List<TeachCourseResult> findTeacherInspect(@Param("schoolId") Long schoolId,@Param("semester") String semester,@Param("examId") Long examId,@Param("courseCode") String courseCode,@Param("inspectCollegeId") Long inspectCollegeId,@Param("teacherId") Long teacherId);
 }

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

@@ -3,7 +3,9 @@ package com.qmth.teachcloud.report.business.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.report.business.bean.result.ExamRecordResult;
 import com.qmth.teachcloud.report.business.bean.result.SurveyTeacherDistributionResult;
+import com.qmth.teachcloud.report.business.bean.result.TeachCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseRecord;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
 import java.util.List;
 
@@ -35,4 +37,17 @@ public interface TAExamCourseRecordService extends IService<TAExamCourseRecord>
      * @return
      */
     List<SurveyTeacherDistributionResult> surveyTeacherDistribution(Long examId, String courseCode, boolean filter);
+
+    /**
+     * 我的课堂考试分析-考试概况，查找我的课堂数据
+     *
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param inspectCollegeId
+     * @param teacherId
+     * @return
+     */
+    List<TeachCourseResult> findTeacherInspect(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Long teacherId);
 }

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

@@ -16,6 +16,7 @@ import com.qmth.teachcloud.report.business.mapper.TAExamCourseCollegeTeacherMapp
 import com.qmth.teachcloud.report.business.service.ReportCommonService;
 import com.qmth.teachcloud.report.business.service.TAExamCourseCollegeInspectService;
 import com.qmth.teachcloud.report.business.service.TAExamCourseCollegeTeacherService;
+import com.qmth.teachcloud.report.business.service.TAExamCourseRecordService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -46,6 +47,9 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
     @Resource
     TAExamCourseCollegeInspectService taExamCourseCollegeInspectService;
 
+    @Resource
+    TAExamCourseRecordService taExamCourseRecordService;
+
     @Override
     public IPage<TeacherClassRankResult> listClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -120,14 +124,21 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
         // 考试概况
         TAExamCourseCollegeInspectResult taExamCourseCollegeInspectResult = taExamCourseCollegeInspectService.findTeacherInspect(sysUser.getSchoolId(), semester, examId, courseCode, inspectCollegeId);
         TeachCourseResult teachCourseResultFinal = new TeachCourseResult(taExamCourseCollegeInspectResult);
-        TeachCourseResult teachCourseResult = null;
-        // 考试概况
-//        TeachCourseSurveyResult teachCourseSurveyResult = reportCommonService.getTeachCourseSurveyInfo(semester, examId, courseCode);
+        List<TeachCourseResult> teachCourseResultList = taExamCourseRecordService.findTeacherInspect(sysUser.getSchoolId(), semester, examId, courseCode, inspectCollegeId, sysUser.getId());
+        if (Objects.nonNull(teachCourseResultList) && teachCourseResultList.size() > 0) {
+            for (TeachCourseResult t : teachCourseResultList) {
+                if (t.getAbsent()) {
+                    teachCourseResultFinal.setCourseRealityCount(t.getAbsentCount());
+                } else if (!t.getAbsent()) {
+                    teachCourseResultFinal.setCourseAbsentCount(t.getAbsentCount());
+                }
+            }
+        }
         //取总体和应届平均分
         SurveyTeacherExamCourseResult surveyTeacherExamCourseResult = reportCommonService.findAvgScore(schoolId, courseCode, examId, false);
         //查找题目信息
         QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, inspectCollegeId);
-        return new SurveyTeacherViewResult(teachCourseResult, questionListResult, surveyTeacherExamCourseResult);
+        return new SurveyTeacherViewResult(teachCourseResultFinal, questionListResult, surveyTeacherExamCourseResult);
     }
 
     /**
@@ -141,7 +152,7 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
      * @return
      */
     @Override
-    public DimensionAnalyzeResult teacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId,Long teacherId) {
+    public DimensionAnalyzeResult teacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId) {
         return reportCommonService.findDimensionInfo(examId, courseCode, collegeId, teacherId);
     }
 

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

@@ -3,13 +3,16 @@ package com.qmth.teachcloud.report.business.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.report.business.bean.result.ExamRecordResult;
 import com.qmth.teachcloud.report.business.bean.result.SurveyTeacherDistributionResult;
+import com.qmth.teachcloud.report.business.bean.result.TeachCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseRecord;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseRecordMapper;
 import com.qmth.teachcloud.report.business.service.TAExamCourseRecordService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -48,4 +51,20 @@ public class TAExamCourseRecordServiceImpl extends ServiceImpl<TAExamCourseRecor
     public List<SurveyTeacherDistributionResult> surveyTeacherDistribution(Long examId, String courseCode, boolean filter) {
         return taExamCourseRecordMapper.surveyTeacherDistribution(examId, courseCode, filter);
     }
+
+    /**
+     * 我的课堂考试分析-考试概况，查找我的课堂数据
+     *
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param inspectCollegeId
+     * @param teacherId
+     * @return
+     */
+    @Override
+    public List<TeachCourseResult> findTeacherInspect(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Long teacherId) {
+        return taExamCourseRecordMapper.findTeacherInspect(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, inspectCollegeId, teacherId);
+    }
 }

teachcloud-report-business/src/main/resources/mapper/TAExamCourseRecordMapper.xml

@@ -153,4 +153,8 @@
             </if>
         </where>
     </select>
+
+    <select id="findTeacherInspect" resultType="com.qmth.teachcloud.report.business.bean.result.TeachCourseResult">
+
+    </select>
 </mapper>