新增我的考试分析

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

@@ -40,7 +40,8 @@ public class SurveyTeacherViewResult implements Serializable {
         this.teachCourseSurveyResult = teachCourseSurveyResult;
     }
 
-    public SurveyTeacherViewResult(TeachCourseResult teachCourseResult, QuestionListResult questionInfo, SurveyTeacherExamCourseResult surveyTeacher) {
+    public SurveyTeacherViewResult(List<SurveyTeacherGradeDistributionResult> gradeDistribution, TeachCourseResult teachCourseResult, QuestionListResult questionInfo, SurveyTeacherExamCourseResult surveyTeacher) {
+        this.gradeDistribution = gradeDistribution;
         this.teachCourseResult = teachCourseResult;
         this.questionInfo = questionInfo;
         this.surveyTeacher = surveyTeacher;

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

@@ -39,9 +39,10 @@ public interface TAExamCourseRecordMapper extends BaseMapper<TAExamCourseRecord>
      * @param examId
      * @param courseCode
      * @param filter
+     * @param inspectCollegeId
      * @return
      */
-    List<SurveyTeacherDistributionResult> surveyTeacherDistribution(@Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("filter") boolean filter);
+    List<SurveyTeacherDistributionResult> surveyTeacherDistribution(@Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("filter") boolean filter, @Param("inspectCollegeId") Long inspectCollegeId);
 
     /**
      * 我的课堂考试分析-考试概况，查找我的课堂数据
@@ -54,5 +55,5 @@ public interface TAExamCourseRecordMapper extends BaseMapper<TAExamCourseRecord>
      * @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);
+    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

@@ -34,9 +34,10 @@ public interface TAExamCourseRecordService extends IService<TAExamCourseRecord>
      * @param examId
      * @param courseCode
      * @param filter
+     * @param inspectCollegeId
      * @return
      */
-    List<SurveyTeacherDistributionResult> surveyTeacherDistribution(Long examId, String courseCode, boolean filter);
+    List<SurveyTeacherDistributionResult> surveyTeacherDistribution(Long examId, String courseCode, boolean filter, Long inspectCollegeId);
 
     /**
      * 我的课堂考试分析-考试概况，查找我的课堂数据

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

@@ -243,7 +243,7 @@ public class ReportCommonServiceImpl implements ReportCommonService {
     @Override
     public List<SurveyTeacherGradeDistributionResult> surveyTeacherDistribution(Long examId, String courseCode, Long collegeId, boolean filter) {
         List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = new ArrayList<>();
-        List<SurveyTeacherDistributionResult> surveyTeacherDistributionResultList = taExamCourseRecordService.surveyTeacherDistribution(examId, courseCode, filter);
+        List<SurveyTeacherDistributionResult> surveyTeacherDistributionResultList = taExamCourseRecordService.surveyTeacherDistribution(examId, courseCode, filter, collegeId);
         if (Objects.isNull(surveyTeacherDistributionResultList) && surveyTeacherDistributionResultList.size() > 0) {
             return null;
         }
@@ -340,12 +340,12 @@ public class ReportCommonServiceImpl implements ReportCommonService {
         if (SystemConstant.longNotNull(collegeId) && !SystemConstant.longNotNull(teacherId)) {
             // 有学院id无教师id -> 开课院长看各考察学院数据
             dimensionInfoDatasource = tbDimensionService.findDimensionInfo(examId, courseCode, collegeId);
-        } else if (SystemConstant.longNotNull(teacherId) && !SystemConstant.longNotNull(collegeId)){
+        } else if (SystemConstant.longNotNull(teacherId) && !SystemConstant.longNotNull(collegeId)) {
             // 有教师id无学院id -> 开课院长看各授课教师数据
             dimensionInfoDatasource = tbDimensionService.findDimensionByTeacherInfo(examId, courseCode, teacherId);
-        } else if (SystemConstant.longNotNull(teacherId) && SystemConstant.longNotNull(collegeId)){
+        } else if (SystemConstant.longNotNull(teacherId) && SystemConstant.longNotNull(collegeId)) {
             // 既有教师id又有学院id -> 任课教师看某个学院下自己的数据
-            dimensionInfoDatasource = tbDimensionService.findDimensionByTeacherCollegeInfo(examId,courseCode,teacherId,collegeId);
+            dimensionInfoDatasource = tbDimensionService.findDimensionByTeacherCollegeInfo(examId, courseCode, teacherId, collegeId);
         }
 //        if (dimensionInfoDatasource.size() < 1) {
 //            throw ExceptionResultEnum.DATA_ERROR.exception();
@@ -392,7 +392,7 @@ public class ReportCommonServiceImpl implements ReportCommonService {
         if (SystemConstant.longNotNull(collegeId) && !SystemConstant.longNotNull(teacherId)) {
             // 有学院id无教师id -> 开课院长看各考察学院数据
             answerDetailDatasource = taExamCourseDifficultService.findValidAnswerDetail(examId, courseCode, collegeId);
-        } else if (SystemConstant.longNotNull(teacherId) && !SystemConstant.longNotNull(collegeId)){
+        } else if (SystemConstant.longNotNull(teacherId) && !SystemConstant.longNotNull(collegeId)) {
             // 有教师id无学院id -> 开课院长看各授课教师数据
             answerDetailDatasource = taExamCourseTeacherDifficultService.findValidAnswerDetail(examId, courseCode, teacherId);
         } else if (SystemConstant.longNotNull(teacherId) && SystemConstant.longNotNull(collegeId)) {

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

@@ -140,9 +140,11 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
         }
         //取总体和应届平均分
         SurveyTeacherExamCourseResult surveyTeacherExamCourseResult = reportCommonService.findAvgScore(schoolId, courseCode, examId, false);
+        //学院学科报表科目描述
+        List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = reportCommonService.surveyTeacherDistribution(examId, courseCode, inspectCollegeId, false);
         //查找题目信息
         QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, inspectCollegeId);
-        return new SurveyTeacherViewResult(teachCourseResultFinal, questionListResult, surveyTeacherExamCourseResult);
+        return new SurveyTeacherViewResult(surveyTeacherGradeDistributionResultList, teachCourseResultFinal, questionListResult, surveyTeacherExamCourseResult);
     }
 
     /**
@@ -171,7 +173,7 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
      * @return
      */
     @Override
-    public QuestionInfoResult teacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId,Long teacherId) {
+    public QuestionInfoResult teacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId) {
         return reportCommonService.findSituationOfQuestions(examId, courseCode, collegeId, teacherId);
     }
 }

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

@@ -45,11 +45,13 @@ public class TAExamCourseRecordServiceImpl extends ServiceImpl<TAExamCourseRecor
      *
      * @param examId
      * @param courseCode
+     * @param filter
+     * @param inspectCollegeId
      * @return
      */
     @Override
-    public List<SurveyTeacherDistributionResult> surveyTeacherDistribution(Long examId, String courseCode, boolean filter) {
-        return taExamCourseRecordMapper.surveyTeacherDistribution(examId, courseCode, filter);
+    public List<SurveyTeacherDistributionResult> surveyTeacherDistribution(Long examId, String courseCode, boolean filter, Long inspectCollegeId) {
+        return taExamCourseRecordMapper.surveyTeacherDistribution(examId, courseCode, filter, inspectCollegeId);
     }
 
     /**

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

@@ -151,6 +151,9 @@
             <if test="filter != null and filter == true">
                 and tbec.publish_status = 'PUBLISH'
             </if>
+            <if test="inspectCollegeId != null and inspectCollegeId != ''">
+                AND taecr.inspect_college_id = #{inspectCollegeId}
+            </if>
         </where>
     </select>