日常更新

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -91,6 +91,8 @@ public class SystemConstant {
     public static final String EXAM_STUDENT_REPORT = "report:cache:examStudent";
     public static final String COLLEGE_DEAN_REPORT = "report:cache:collegeDean";
     public static final String COLLEGE_COURSE_REPORT = "report:cache:collegeCourse";
+    public static final String SURVEY_TEACHER_VIEW_REPORT = "report:cache:surveyTeacherView";
+    public static final String TEACHER_VIEW_REPORT = "report:cache:teacherView";
 
     /**
      * 鉴权

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

@@ -26,6 +26,9 @@ public class CellResult implements Serializable {
     @ApiModelProperty(value = "学校平均分得分率")
     private Double schAvgScoreRate;
 
+    @ApiModelProperty(value = "教师平均分得分率")
+    private Double teaAvgScoreRate;
+
     @ApiModelProperty(value = "计数")
     private Integer count;
 
@@ -41,6 +44,14 @@ public class CellResult implements Serializable {
         this.count = count;
     }
 
+    public Double getTeaAvgScoreRate() {
+        return teaAvgScoreRate;
+    }
+
+    public void setTeaAvgScoreRate(Double teaAvgScoreRate) {
+        this.teaAvgScoreRate = teaAvgScoreRate;
+    }
+
     public String getInterpret() {
         return interpret;
     }

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

@@ -1,7 +1,11 @@
 package com.qmth.teachcloud.report.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.teachcloud.report.business.bean.result.CellResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseDifficult;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,13 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseDifficult;
  */
 public interface TAExamCourseDifficultMapper extends BaseMapper<TAExamCourseDifficult> {
 
+    /**
+     * 查找有效答案
+     *
+     * @param examId
+     * @param courseCode
+     * @param collegeId
+     * @return
+     */
+    List<CellResult> findValidAnswerDetail(@Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("collegeId") Long collegeId);
 }

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

@@ -1,7 +1,11 @@
 package com.qmth.teachcloud.report.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.teachcloud.report.business.bean.result.CellResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseTeacherDifficult;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,13 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseTeacherDifficult;
  */
 public interface TAExamCourseTeacherDifficultMapper extends BaseMapper<TAExamCourseTeacherDifficult> {
 
+    /**
+     * 查找有效答案
+     *
+     * @param examId
+     * @param courseCode
+     * @param teacherId
+     * @return
+     */
+    List<CellResult> findValidAnswerDetail(@Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("teacherId") Long teacherId);
 }

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

@@ -1,8 +1,11 @@
 package com.qmth.teachcloud.report.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.teachcloud.report.business.bean.result.CellResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseDifficult;
 
+import java.util.List;
+
 /**
  * <p>
  * 考试课程，各难度题目得分率表（难度题得分率、中等难度题得分率、简单题得分率） 服务类
@@ -13,4 +16,13 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseDifficult;
  */
 public interface TAExamCourseDifficultService extends IService<TAExamCourseDifficult> {
 
+    /**
+     * 查找有效答案
+     *
+     * @param examId
+     * @param courseCode
+     * @param collegeId
+     * @return
+     */
+    List<CellResult> findValidAnswerDetail(Long examId, String courseCode, Long collegeId);
 }

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

@@ -93,4 +93,17 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @return
      */
     DimensionAnalyzeResult surveyTeacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId);
+
+    /**
+     * 开课课程考试总览-各难度水平题目上的作答分析接口
+     *
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param collegeId
+     * @param teacherId
+     * @return
+     */
+    Object surveyTeacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId);
 }

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

@@ -1,8 +1,11 @@
 package com.qmth.teachcloud.report.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.teachcloud.report.business.bean.result.CellResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseTeacherDifficult;
 
+import java.util.List;
+
 /**
  * <p>
  * 授课教师-全校各难度得分率对比 服务类
@@ -13,4 +16,13 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseTeacherDifficult;
  */
 public interface TAExamCourseTeacherDifficultService extends IService<TAExamCourseTeacherDifficult> {
 
+    /**
+     * 查找有效答案
+     *
+     * @param examId
+     * @param courseCode
+     * @param teacherId
+     * @return
+     */
+    List<CellResult> findValidAnswerDetail(Long examId, String courseCode, Long teacherId);
 }

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

@@ -52,6 +52,9 @@ public class ReportCommonServiceImpl implements ReportCommonService {
     @Resource
     TAExamCourseCollegeTeacherService taExamCourseCollegeTeacherService;
 
+    @Resource
+    TAExamCourseDifficultService taExamCourseDifficultService;
+
     /**
      * 学院学科报表查询科目信息
      *

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

@@ -1,11 +1,15 @@
 package com.qmth.teachcloud.report.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.report.business.bean.result.CellResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseDifficult;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseDifficultMapper;
 import com.qmth.teachcloud.report.business.service.TAExamCourseDifficultService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  * 考试课程，各难度题目得分率表（难度题得分率、中等难度题得分率、简单题得分率） 服务实现类
@@ -17,4 +21,19 @@ import org.springframework.stereotype.Service;
 @Service
 public class TAExamCourseDifficultServiceImpl extends ServiceImpl<TAExamCourseDifficultMapper, TAExamCourseDifficult> implements TAExamCourseDifficultService {
 
+    @Resource
+    TAExamCourseDifficultMapper taExamCourseDifficultMapper;
+
+    /**
+     * 查找有效答案
+     *
+     * @param examId
+     * @param courseCode
+     * @param collegeId
+     * @return
+     */
+    @Override
+    public List<CellResult> findValidAnswerDetail(Long examId, String courseCode, Long collegeId) {
+        return taExamCourseDifficultMapper.findValidAnswerDetail(examId, courseCode, collegeId);
+    }
 }

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

@@ -163,6 +163,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @return
      */
     @Override
+    @Cacheable(value = SystemConstant.SURVEY_TEACHER_VIEW_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode")
     public SurveyTeacherViewResult surveyTeacherView(Long schoolId, SemesterEnum semester, Long examId, String courseCode) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         if (Objects.isNull(sysUser)) {
@@ -219,12 +220,28 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @return
      */
     @Override
+    @Cacheable(value = SystemConstant.TEACHER_VIEW_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode + '-' + #collegeId + '-' + #teacherId")
     public DimensionAnalyzeResult surveyTeacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        if (Objects.isNull(sysUser)) {
-            throw ExceptionResultEnum.NOT_LOGIN.exception();
-        }
-        //学院学科报表维度查询-按学院/教师查询
-        return reportCommonService.findDimensionInfo(examId, courseCode, Objects.isNull(collegeId) ? sysUser.getOrgId() : collegeId, teacherId);
+        return reportCommonService.findDimensionInfo(examId, courseCode, collegeId, teacherId);
+    }
+
+    /**
+     * 开课课程考试总览-各难度水平题目上的作答分析接口
+     *
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @param collegeId
+     * @param teacherId
+     * @return
+     */
+    @Override
+    public Object surveyTeacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId) {
+        //查找试卷结构
+        List<TBPaperStructResult> questionDatasource = tbPaperStructService.findQuestionInfo(examId, courseCode);
+        //开课课程考试总览-按学院/教师查询
+        QuestionInfoResult questionInfoResult = reportCommonService.findSituationOfQuestions(examId, courseCode, collegeId, questionDatasource);
+        return questionInfoResult;
     }
 }

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

@@ -1,11 +1,15 @@
 package com.qmth.teachcloud.report.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.report.business.bean.result.CellResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseTeacherDifficult;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseTeacherDifficultMapper;
 import com.qmth.teachcloud.report.business.service.TAExamCourseTeacherDifficultService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  * 授课教师-全校各难度得分率对比 服务实现类
@@ -17,4 +21,19 @@ import org.springframework.stereotype.Service;
 @Service
 public class TAExamCourseTeacherDifficultServiceImpl extends ServiceImpl<TAExamCourseTeacherDifficultMapper, TAExamCourseTeacherDifficult> implements TAExamCourseTeacherDifficultService {
 
+    @Resource
+    TAExamCourseTeacherDifficultMapper taExamCourseTeacherDifficultMapper;
+
+    /**
+     * 查找有效答案
+     *
+     * @param examId
+     * @param courseCode
+     * @param teacherId
+     * @return
+     */
+    @Override
+    public List<CellResult> findValidAnswerDetail(Long examId, String courseCode, Long teacherId) {
+        return taExamCourseTeacherDifficultMapper.findValidAnswerDetail(examId, courseCode, teacherId);
+    }
 }

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

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.teachcloud.report.business.mapper.TAExamCourseDifficultMapper">
 
+    <select id="findValidAnswerDetail" resultType="com.qmth.teachcloud.report.business.bean.result.CellResult">
+        SELECT
+            tik.paper_type AS paperType,
+            tik.`scope`,
+            tik.count,
+            tik.sch_avg_score_rate as schAvgScoreRate,
+            tik.col_avg_score_rate as colAvgScoreRate
+        from t_a_exam_course_difficult tik
+        JOIN t_b_paper_struct tbps on
+            tbps.id = tik.paper_id
+       <where>
+           <if test="collegeId != null and collegeId != ''">
+               and tik.college_id = #{collegeId}
+           </if>
+           <if test="examId != null and examId != ''">
+               and tik.exam_id = #{examId}
+           </if>
+           <if test="courseCode != null and courseCode != ''">
+               and tik.course_code = #{courseCode}
+           </if>
+       </where>
+    </select>
 </mapper>

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

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.teachcloud.report.business.mapper.TAExamCourseTeacherDifficultMapper">
 
+    <select id="findValidAnswerDetail" resultType="com.qmth.teachcloud.report.business.bean.result.CellResult">
+        SELECT
+        tik.paper_type AS paperType,
+        tik.`scope`,
+        tik.count,
+        tik.sch_avg_score_rate as schAvgScoreRate,
+        tik.tea_avg_score_rate as teaAvgScoreRate
+        from t_a_exam_course_teacher_difficult tik
+        JOIN t_b_paper_struct tbps on
+        tbps.id = tik.paper_id
+        <where>
+            <if test="teacherId != null and teacherId != ''">
+                and tik.teacher_id = #{teacherId}
+            </if>
+            <if test="examId != null and examId != ''">
+                and tik.exam_id = #{examId}
+            </if>
+            <if test="courseCode != null and courseCode != ''">
+                and tik.course_code = #{courseCode}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -3,10 +3,13 @@ package com.qmth.teachcloud.report.api;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult;
+import com.qmth.teachcloud.report.business.bean.result.*;
+import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.InspectCourseTotalReportResult;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.CourseReportService;
@@ -44,7 +47,7 @@ public class CourseController {
 
     @ApiOperation(value = "开课课程考试总览-教师各课堂成绩排名接口")
     @RequestMapping(value = "/survey_teacher/teacher_view", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseCollegeTeacherResult.class)})
     public Result surveyTeacherTeacherView(@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,
@@ -56,19 +59,39 @@ public class CourseController {
 
     @ApiOperation(value = "开课课程考试总览-试题难度得分情况分析接口")
     @RequestMapping(value = "/survey_teacher/question_view", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = DimensionAnalyzeResult.class)})
     public Result surveyTeacherQuestionView(@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 = false) @RequestParam(required = false) String collegeId,
                                             @ApiParam(value = "任课老师id", required = false) @RequestParam(required = false) String teacherId) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionView(Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : null, Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        if (Objects.isNull(sysUser)) {
+            throw ExceptionResultEnum.NOT_LOGIN.exception();
+        }
+        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionView(Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId(), Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
+    }
+
+    @ApiOperation(value = "开课课程考试总览-各难度水平题目上的作答分析接口")
+    @RequestMapping(value = "/survey_teacher/question_answer_view", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
+    public Result surveyTeacherQuestionAnswerView(@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 = false) @RequestParam(required = false) String collegeId,
+                                                  @ApiParam(value = "任课老师id", required = false) @RequestParam(required = false) String teacherId) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        if (Objects.isNull(sysUser)) {
+            throw ExceptionResultEnum.NOT_LOGIN.exception();
+        }
+        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionAnswerView(Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId(), Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
     }
 
     @ApiOperation(value = "开课课程考试总览图表接口")
     @RequestMapping(value = "/survey_teacher/view", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
+    @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,
@@ -78,19 +101,18 @@ public class CourseController {
 
     @ApiOperation(value = "考查课程考试总览-公共课概况接口")
     @RequestMapping(value = "/survey_inspect/view", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = InspectCourseTotalReportResult.class)})
     public Result surveyInspectView(@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) {
         Object obj = ServletUtil.getRequestHeaderSchoolId();
         Long tmp = SystemConstant.convertIdToLong(String.valueOf(obj));
-
         return ResultUtil.ok(courseReportService.findInfoInspectCourseExamTotal(Objects.isNull(schoolId) ? tmp : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId)));
     }
 
     @ApiOperation(value = "考查课程考试分析接口")
     @RequestMapping(value = "/survey_inspect_analyse/view", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = CollegeAndCourseResult.class)})
     public Result surveyInspectAnalyseView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,