bug修复

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/CacheService.java

@@ -202,8 +202,9 @@ public interface CacheService {
      * @param semester
      * @param examId
      * @param courseCode
+     * @param collegeId
      */
-    public void removeCollegeCourseCache(Long schoolId, String semester, Long examId, String courseCode);
+    public void removeCollegeCourseCache(Long schoolId, String semester, Long examId, String courseCode, Long collegeId);
 
     /**
      * 删除开课课程考试总览图表缓存
@@ -212,7 +213,8 @@ public interface CacheService {
      * @param semester
      * @param examId
      * @param courseCode
+     * @param collegeId
      */
-    public void removeSurveyTeacherViewCache(Long schoolId, String semester, Long examId, String courseCode);
+    public void removeSurveyTeacherViewCache(Long schoolId, String semester, Long examId, String courseCode, Long collegeId);
 
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/CacheServiceImpl.java

@@ -323,10 +323,11 @@ public class CacheServiceImpl implements CacheService {
      * @param semester
      * @param examId
      * @param courseCode
+     * @param collegeId
      */
     @Override
-    @CacheEvict(value = SystemConstant.COLLEGE_COURSE_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode")
-    public void removeCollegeCourseCache(Long schoolId, String semester, Long examId, String courseCode) {
+    @CacheEvict(value = SystemConstant.COLLEGE_COURSE_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode + '-' + #collegeId")
+    public void removeCollegeCourseCache(Long schoolId, String semester, Long examId, String courseCode, Long collegeId) {
 
     }
 
@@ -337,10 +338,11 @@ public class CacheServiceImpl implements CacheService {
      * @param semester
      * @param examId
      * @param courseCode
+     * @param collegeId
      */
     @Override
-    @CacheEvict(value = SystemConstant.SURVEY_TEACHER_VIEW_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode")
-    public void removeSurveyTeacherViewCache(Long schoolId, String semester, Long examId, String courseCode) {
+    @CacheEvict(value = SystemConstant.SURVEY_TEACHER_VIEW_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode + '-' + #collegeId")
+    public void removeSurveyTeacherViewCache(Long schoolId, String semester, Long examId, String courseCode, Long collegeId) {
 
     }
 }

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

@@ -61,9 +61,10 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @param semester
      * @param examId
      * @param courseCode
+     * @param collegeId
      * @return
      */
-    CollegeAndCourseResult surveyInspectAnalyseView(Long schoolId, SemesterEnum semester, Long examId, String courseCode);
+    CollegeAndCourseResult surveyInspectAnalyseView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId);
 
     /**
      * 开课课程考试总览图表接口
@@ -72,9 +73,10 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @param semester
      * @param examId
      * @param courseCode
+     * @param collegeId
      * @return
      */
-    SurveyTeacherViewResult surveyTeacherView(Long schoolId, SemesterEnum semester, Long examId, String courseCode);
+    SurveyTeacherViewResult surveyTeacherView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId);
 
     /**
      * 开课课程考试总览-教师各课堂成绩排名接口

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

@@ -144,27 +144,24 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @param semester
      * @param examId
      * @param courseCode
+     * @param collegeId
      * @return
      */
     @Override
-    @Cacheable(value = SystemConstant.COLLEGE_COURSE_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode")
-    public CollegeAndCourseResult surveyInspectAnalyseView(Long schoolId, SemesterEnum semester, Long examId, String courseCode) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        if (Objects.isNull(sysUser)) {
-            throw ExceptionResultEnum.NOT_LOGIN.exception();
-        }
+    @Cacheable(value = SystemConstant.COLLEGE_COURSE_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode + '-' + #collegeId")
+    public CollegeAndCourseResult surveyInspectAnalyseView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId) {
         //学院学科报表查询科目信息
-        CourseInfoResult courseInfoResult = reportCommonService.findCourseInfo(examId, courseCode, sysUser.getOrgId());
+        CourseInfoResult courseInfoResult = reportCommonService.findCourseInfo(examId, courseCode, collegeId);
         //学院学科报表科目描述
-        CollegeAndSchoolGradeDistributionResult collegeAndSchoolGradeDistributionResult = reportCommonService.findCourseDistribution(examId, courseCode, sysUser.getOrgId());
+        CollegeAndSchoolGradeDistributionResult collegeAndSchoolGradeDistributionResult = reportCommonService.findCourseDistribution(examId, courseCode, collegeId);
         //学院学科报表维度查询
-        DimensionAnalyzeResult dimensionAnalyzeResult = reportCommonService.findDimensionInfo(examId, courseCode, sysUser.getOrgId(), null);
+        DimensionAnalyzeResult dimensionAnalyzeResult = reportCommonService.findDimensionInfo(examId, courseCode, collegeId, null);
         //查找题目相关
-        QuestionInfoResult questionInfoResult = reportCommonService.findSituationOfQuestions(examId, courseCode, sysUser.getOrgId(), null);
+        QuestionInfoResult questionInfoResult = reportCommonService.findSituationOfQuestions(examId, courseCode, collegeId, null);
         //查找老师得分
-        TeacherInfoListResult teacherInfoListResult = reportCommonService.findTeacherInfo(examId, courseCode, sysUser.getOrgId());
+        TeacherInfoListResult teacherInfoListResult = reportCommonService.findTeacherInfo(examId, courseCode, collegeId);
         //查找题目信息
-        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, sysUser.getOrgId());
+        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, collegeId);
 
         return new CollegeAndCourseResult(courseInfoResult, collegeAndSchoolGradeDistributionResult, dimensionAnalyzeResult,
                 questionInfoResult, teacherInfoListResult, questionListResult);
@@ -177,15 +174,12 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @param semester
      * @param examId
      * @param courseCode
+     * @param collegeId
      * @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)) {
-            throw ExceptionResultEnum.NOT_LOGIN.exception();
-        }
+    @Cacheable(value = SystemConstant.SURVEY_TEACHER_VIEW_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode + '-' + #collegeId")
+    public SurveyTeacherViewResult surveyTeacherView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId) {
         // 考试概况
         TeachCourseSurveyResult teachCourseSurveyResult = this.getTeachCourseSurveyInfo(semester, examId, courseCode);
 
@@ -193,9 +187,9 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
         SurveyTeacherExamCourseResult surveyTeacherExamCourseResult = reportCommonService.findAvgScore(schoolId, courseCode, examId, false);
 
         //学院学科报表科目描述
-        List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = reportCommonService.surveyTeacherDistribution(examId, courseCode, sysUser.getOrgId(), false);
+        List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = reportCommonService.surveyTeacherDistribution(examId, courseCode, collegeId, false);
         //查找题目信息
-        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, sysUser.getOrgId());
+        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, collegeId);
         return new SurveyTeacherViewResult(surveyTeacherGradeDistributionResultList, questionListResult, surveyTeacherExamCourseResult, teachCourseSurveyResult);
     }
 

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

@@ -139,7 +139,11 @@ public class CourseController {
                                     @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                     @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                     @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        if (Objects.isNull(sysUser)) {
+            throw ExceptionResultEnum.NOT_LOGIN.exception();
+        }
+        return ResultUtil.ok(taExamCourseService.surveyTeacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, sysUser.getOrgId()));
     }
 
     @ApiOperation(value = "考查课程考试总览-公共课概况接口")
@@ -168,7 +172,11 @@ public class CourseController {
                                            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                            @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId) {
-        return ResultUtil.ok(taExamCourseService.surveyInspectAnalyseView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        if (Objects.isNull(sysUser)) {
+            throw ExceptionResultEnum.NOT_LOGIN.exception();
+        }
+        return ResultUtil.ok(taExamCourseService.surveyInspectAnalyseView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, sysUser.getOrgId()));
     }
 
     @ApiOperation(value = "赋分管理列表接口")
@@ -216,15 +224,15 @@ public class CourseController {
             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
             @ApiParam(value = "赋分系数", required = true) @RequestParam String coefficient) {
 
-        if (!coefficient.equals(SystemConstant.DEFAULT_SIGN)){
+        if (!coefficient.equals(SystemConstant.DEFAULT_SIGN)) {
             Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.DATA_CALCULATE);
             map.put("examId", examId);
             map.put("courseCode", courseCode);
             map.put("coefficient", coefficient);
             TBExamCourseService tbExamCourseService = SpringContextHolder.getBean(TBExamCourseService.class);
             TBExamCourse tbExamCourse = tbExamCourseService.getOne(new QueryWrapper<TBExamCourse>().lambda()
-                    .eq(TBExamCourse::getExamId,examId)
-                    .eq(TBExamCourse::getCourseCode,courseCode));
+                    .eq(TBExamCourse::getExamId, examId)
+                    .eq(TBExamCourse::getCourseCode, courseCode));
 
             analyzeForReportService.realityForCalculate(SystemConstant.convertIdToLong(examId), courseCode);
             map.put("tbExamCourse", tbExamCourse);