Merge branch 'dev_v2.1.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.1.0

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

@@ -93,6 +93,7 @@ public class SystemConstant {
     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";
+    public static final String TEACHER_ANSWER_VIEW_REPORT = "report:cache:teacherAnswerView";
 
     /**
      * 鉴权

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

@@ -1,5 +1,6 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -14,6 +15,9 @@ import java.math.BigDecimal;
  */
 public class CellResult implements Serializable {
 
+    @ApiModelProperty(value = "试卷类型")
+    private String paperType;
+
     @ApiModelProperty(value = "简介")
     private String interpret;
 
@@ -44,6 +48,14 @@ public class CellResult implements Serializable {
         this.count = count;
     }
 
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
     public Double getTeaAvgScoreRate() {
         return teaAvgScoreRate;
     }

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

@@ -25,6 +25,28 @@ public class TAExamCourseCollegeInspectResult extends TAExamCourseCollegeInspect
     @ApiModelProperty(value = "学院名称")
     private String collegeName;
 
+    @ApiModelProperty(value = "考试时间")
+    private String examTime;
+
+    @ApiModelProperty(value = "考试名称")
+    private String examName;
+
+    public String getExamTime() {
+        return examTime;
+    }
+
+    public void setExamTime(String examTime) {
+        this.examTime = examTime;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
     @Override
     public Long getCollegeId() {
         return collegeId;

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

@@ -13,19 +13,19 @@ public class TrialCalculationResult {
     // 赋分前-总体
     private BigDecimal avgScore;
     private BigDecimal failRate;
-    private BigDecimal failCount;
+    private int failCount;
     // 赋分前-应届
     private BigDecimal currentAvgScore;
     private BigDecimal currentFailRate;
-    private BigDecimal currentFailCount;
+    private int currentFailCount;
     // 赋分后-总体
     private BigDecimal avgScoreAssign;
     private BigDecimal failRateAssign;
-    private BigDecimal failCountAssign;
+    private int failCountAssign;
     // 赋分后-应届
     private BigDecimal currentAvgScoreAssign;
     private BigDecimal currentFailRateAssign;
-    private BigDecimal currentFailCountAssign;
+    private int currentFailCountAssign;
 
     public int getTotalCount() {
         return totalCount;
@@ -59,11 +59,11 @@ public class TrialCalculationResult {
         this.failRate = failRate;
     }
 
-    public BigDecimal getFailCount() {
+    public int getFailCount() {
         return failCount;
     }
 
-    public void setFailCount(BigDecimal failCount) {
+    public void setFailCount(int failCount) {
         this.failCount = failCount;
     }
 
@@ -83,11 +83,11 @@ public class TrialCalculationResult {
         this.currentFailRate = currentFailRate;
     }
 
-    public BigDecimal getCurrentFailCount() {
+    public int getCurrentFailCount() {
         return currentFailCount;
     }
 
-    public void setCurrentFailCount(BigDecimal currentFailCount) {
+    public void setCurrentFailCount(int currentFailCount) {
         this.currentFailCount = currentFailCount;
     }
 
@@ -107,11 +107,11 @@ public class TrialCalculationResult {
         this.failRateAssign = failRateAssign;
     }
 
-    public BigDecimal getFailCountAssign() {
+    public int getFailCountAssign() {
         return failCountAssign;
     }
 
-    public void setFailCountAssign(BigDecimal failCountAssign) {
+    public void setFailCountAssign(int failCountAssign) {
         this.failCountAssign = failCountAssign;
     }
 
@@ -131,11 +131,11 @@ public class TrialCalculationResult {
         this.currentFailRateAssign = currentFailRateAssign;
     }
 
-    public BigDecimal getCurrentFailCountAssign() {
+    public int getCurrentFailCountAssign() {
         return currentFailCountAssign;
     }
 
-    public void setCurrentFailCountAssign(BigDecimal currentFailCountAssign) {
+    public void setCurrentFailCountAssign(int currentFailCountAssign) {
         this.currentFailCountAssign = currentFailCountAssign;
     }
 }

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

@@ -22,9 +22,10 @@ public interface TAExamCourseCollegeInspectMapper extends BaseMapper<TAExamCours
      *
      * @param examId
      * @param courseCode
+     * @param collegeId
      * @return
      */
-    List<TAExamCourseCollegeInspectResult> findCourseDescriptiveStatisticsForCollege(@Param("examId") Long examId, @Param("courseCode") String courseCode);
+    List<TAExamCourseCollegeInspectResult> findCourseDescriptiveStatisticsForCollege(@Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("collegeId") Long collegeId);
 
     /**
      * 查找学校科目维度

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

@@ -47,7 +47,8 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
      */
     IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("examId") Long examId,
                                                  @Param("courseCode") String courseCode,
-                                                 @Param("publishStatus") String publishStatus);
+                                                 @Param("publishStatus") String publishStatus,
+                                                 @Param("semester") String semester);
 
     Map<String, String> getScoreAndRate(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 

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

@@ -60,10 +60,10 @@ public interface ReportCommonService {
      * @param examId
      * @param courseCode
      * @param collegeId
-     * @param questionDatasource
+     * @param teacherId
      * @return
      */
-    QuestionInfoResult findSituationOfQuestions(Long examId, String courseCode, Long collegeId, List<TBPaperStructResult> questionDatasource);
+    QuestionInfoResult findSituationOfQuestions(Long examId, String courseCode, Long collegeId,Long teacherId);
 
     /**
      * 查找老师信息
@@ -81,8 +81,7 @@ public interface ReportCommonService {
      * @param examId
      * @param courseCode
      * @param collegeId
-     * @param questionDatasource
      * @return
      */
-    QuestionListResult findQuestionInfo(Long examId, String courseCode, Long collegeId, List<TBPaperStructResult> questionDatasource);
+    QuestionListResult findQuestionInfo(Long examId, String courseCode, Long collegeId);
 }

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

@@ -21,9 +21,10 @@ public interface TAExamCourseCollegeInspectService extends IService<TAExamCourse
      *
      * @param examId
      * @param courseCode
+     * @param collegeId
      * @return
      */
-    List<TAExamCourseCollegeInspectResult> findCourseDescriptiveStatisticsForCollege(Long examId, String courseCode);
+    List<TAExamCourseCollegeInspectResult> findCourseDescriptiveStatisticsForCollege(Long examId, String courseCode, Long collegeId);
 
     /**
      * 查找学校科目维度

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

@@ -7,6 +7,7 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -41,9 +42,10 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @param examId
      * @param courseCode
      * @param publishStatus
+     * @param semester
      * @return
      */
-    IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus);
+    IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus, SemesterEnum semester);
 
     Map<String, Object> getGradeDistribute(String semester, Long examId, String courseCode);
 
@@ -81,20 +83,17 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      */
     IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, SemesterEnum semester, Long examId, String courseCode);
 
-//    /**
-//     * 开课课程考试总览-试题难度得分情况分析接口
-//     *
-//     * @param schoolId
-//     * @param semester
-//     * @param examId
-//     * @param courseCode
-//     * @param collegeId
-//     * @param teacherId
-//     * @return
-//     */
-//    Object 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
+     */
     DimensionAnalyzeResult surveyTeacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId);
 
     /**
@@ -108,13 +107,15 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @param teacherId
      * @return
      */
-    Object surveyTeacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId);
+    QuestionInfoResult surveyTeacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId);
 
     /**
      * 赋分试算
-     * @param examId 考试id
-     * @param courseCode 课程编号
-     * @return 快速试算结果
+     *
+     * @param examId      考试id
+     * @param courseCode  课程编号
+     * @param coefficient 赋分系数
+     * @return 结果
      */
-    TrialCalculationResult trialCalculate(Long examId,String courseCode);
+    TrialCalculationResult trialCalculate(Long examId, String courseCode, BigDecimal coefficient);
 }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.gson.Gson;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.report.business.bean.result.*;
-import com.qmth.teachcloud.report.business.entity.TBCommonLevelConfig;
 import com.qmth.teachcloud.report.business.entity.TBDimension;
 import com.qmth.teachcloud.report.business.entity.TBPaper;
 import com.qmth.teachcloud.report.business.enums.GradeScopeEnum;
@@ -44,16 +43,16 @@ public class ReportCommonServiceImpl implements ReportCommonService {
     TBDimensionService tbDimensionService;
 
     @Resource
-    TBCommonLevelConfigService tbCommonLevelConfigService;
+    TAExamCourseCollegeTeacherService taExamCourseCollegeTeacherService;
 
     @Resource
-    TBAnswerService tbAnswerService;
+    TAExamCourseDifficultService taExamCourseDifficultService;
 
     @Resource
-    TAExamCourseCollegeTeacherService taExamCourseCollegeTeacherService;
+    TAExamCourseTeacherDifficultService taExamCourseTeacherDifficultService;
 
     @Resource
-    TAExamCourseDifficultService taExamCourseDifficultService;
+    TBPaperStructService tbPaperStructService;
 
     /**
      * 学院学科报表查询科目信息
@@ -72,7 +71,7 @@ public class ReportCommonServiceImpl implements ReportCommonService {
         List<TBPaper> tbPaperList = tbPaperService.list(tbPaperQueryWrapper);
 
         //查找学院科目维度
-        List<TAExamCourseCollegeInspectResult> taExamCourseCollegeInspectResultList = taExamCourseCollegeInspectService.findCourseDescriptiveStatisticsForCollege(examId, courseCode);
+        List<TAExamCourseCollegeInspectResult> taExamCourseCollegeInspectResultList = taExamCourseCollegeInspectService.findCourseDescriptiveStatisticsForCollege(examId, courseCode, collegeId);
         //查找学校科目维度
         List<TAExamCourseCollegeInspectResult> taExamCourseSchoolInspectResultList = taExamCourseCollegeInspectService.findCourseDescriptiveStatisticsForSchool(examId, courseCode);
 
@@ -87,12 +86,12 @@ public class ReportCommonServiceImpl implements ReportCommonService {
         TBPaperInfoResult.setPaperType(paperType);
         TBPaperInfoResult.setCollegeCount(taExamCourseCollegeInspectResultList.size());
 
-        // 学院该科目的描述统计
-        List<TAExamCourseCollegeInspectResult> collegeDescriptiveStatisticsList = taExamCourseCollegeInspectResultList
-                .stream().filter(e -> collegeId.longValue() == e.getCollegeId().longValue()).collect(Collectors.toList());
-        if (collegeDescriptiveStatisticsList.size() != 1) {
-            throw ExceptionResultEnum.DATA_COUNT_EXCEPTION.exception();
-        }
+//        // 学院该科目的描述统计
+//        List<TAExamCourseCollegeInspectResult> collegeDescriptiveStatisticsList = taExamCourseCollegeInspectResultList
+//                .stream().filter(e -> collegeId.longValue() == e.getCollegeId().longValue()).collect(Collectors.toList());
+//        if (collegeDescriptiveStatisticsList.size() != 1) {
+//            throw ExceptionResultEnum.DATA_COUNT_EXCEPTION.exception();
+//        }
         TAExamCourseCollegeInspectResult collegeDescriptiveStatistics = taExamCourseCollegeInspectResultList.get(0);
 
         // 全校该科目的描述统计
@@ -342,45 +341,22 @@ public class ReportCommonServiceImpl implements ReportCommonService {
      * @param examId
      * @param courseCode
      * @param collegeId
-     * @param questionDatasource
+     * @param teacherId
      * @return
      */
     @Override
-    public QuestionInfoResult findSituationOfQuestions(Long examId, String courseCode, Long collegeId, List<TBPaperStructResult> questionDatasource) {
-        //查找难易度
-        QueryWrapper<TBCommonLevelConfig> tbCommonLevelConfigQueryWrapper = new QueryWrapper<>();
-        tbCommonLevelConfigQueryWrapper.lambda().eq(TBCommonLevelConfig::getExamId, examId)
-                .eq(TBCommonLevelConfig::getCourseCode, courseCode)
-                .eq(TBCommonLevelConfig::getLevelType, "难度等级");
-        List<TBCommonLevelConfig> configLevelDatasource = tbCommonLevelConfigService.list(tbCommonLevelConfigQueryWrapper);
+    public QuestionInfoResult findSituationOfQuestions(Long examId, String courseCode, Long collegeId, Long teacherId) {
         //查找答题记录
-        List<TBAnswerResult> answerDetailDatasource = tbAnswerService.findValidAnswerDetail(examId, courseCode);
-        Set<String> paperTypeList = questionDatasource.stream().map(e -> e.getPaperType()).collect(Collectors.toSet());
+        List<CellResult> answerDetailDatasource = null;
+        if (Objects.isNull(teacherId) || Objects.equals(teacherId, "")) {
+            answerDetailDatasource = taExamCourseDifficultService.findValidAnswerDetail(examId, courseCode, collegeId);
+        } else {
+            answerDetailDatasource = taExamCourseTeacherDifficultService.findValidAnswerDetail(examId, courseCode, teacherId);
+        }
+        Set<String> paperTypeList = answerDetailDatasource.stream().map(e -> e.getPaperType()).collect(Collectors.toSet());
         List<PaperTypeResult> questionInfoList = new ArrayList<>();
         for (String paperType : paperTypeList) {
-            List<CellResult> cellList = new ArrayList<>();
-            for (TBCommonLevelConfig tbCommonLevelConfig : configLevelDatasource) {
-                String interpret = tbCommonLevelConfig.getInterpret();
-                String scope = tbCommonLevelConfig.getScope();
-
-                Integer count = questionDatasource.parallelStream()
-                        .filter(e -> paperType.equals(e.getPaperType()) && interpret.equals(e.getDifficult()))
-                        .collect(Collectors.toList()).size(); // 题目信息
-                List<TBAnswerResult> answerDetailForSch = answerDetailDatasource.parallelStream()
-                        .filter(e -> paperType.equals(e.getPaperType()) && interpret.equals(e.getDifficult()))
-                        .collect(Collectors.toList());
-                double colAvgScoreRate = answerDetailForSch.parallelStream()
-                        .filter(e -> collegeId.longValue() == e.getCollegeId()).collect(Collectors.toList())
-                        .parallelStream().collect(Collectors.averagingDouble(s -> s.getScoreRate()));
-                double schAvgScoreRate = answerDetailForSch.parallelStream()
-                        .collect(Collectors.averagingDouble(e -> e.getScoreRate()));
-
-                // 得分率保留2位小数处理
-                colAvgScoreRate = MathUtil.formatDouble2(colAvgScoreRate * 100);
-                schAvgScoreRate = MathUtil.formatDouble2(schAvgScoreRate * 100);
-                cellList.add(new CellResult(interpret, scope, colAvgScoreRate, schAvgScoreRate, count));
-            }
-            questionInfoList.add(new PaperTypeResult(paperType, cellList));
+            questionInfoList.add(new PaperTypeResult(paperType, answerDetailDatasource.stream().filter(e -> Objects.equals(paperType, e.getPaperType())).collect(Collectors.toList())));
         }
         return new QuestionInfoResult(questionInfoList);
     }
@@ -409,11 +385,12 @@ public class ReportCommonServiceImpl implements ReportCommonService {
      * @param examId
      * @param courseCode
      * @param collegeId
-     * @param questionDatasource
      * @return
      */
     @Override
-    public QuestionListResult findQuestionInfo(Long examId, String courseCode, Long collegeId, List<TBPaperStructResult> questionDatasource) {
+    public QuestionListResult findQuestionInfo(Long examId, String courseCode, Long collegeId) {
+        //查找试卷结构
+        List<TBPaperStructResult> questionDatasource = tbPaperStructService.findQuestionInfo(examId, courseCode);
         //查找维度
         QueryWrapper<TBDimension> tbDimensionQueryWrapper = new QueryWrapper<>();
         tbDimensionQueryWrapper.lambda().eq(TBDimension::getExamId, examId)

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

@@ -29,11 +29,12 @@ public class TAExamCourseCollegeInspectServiceImpl extends ServiceImpl<TAExamCou
      *
      * @param examId
      * @param courseCode
+     * @param collegeId
      * @return
      */
     @Override
-    public List<TAExamCourseCollegeInspectResult> findCourseDescriptiveStatisticsForCollege(Long examId, String courseCode) {
-        return taExamCourseCollegeInspectMapper.findCourseDescriptiveStatisticsForCollege(examId, courseCode);
+    public List<TAExamCourseCollegeInspectResult> findCourseDescriptiveStatisticsForCollege(Long examId, String courseCode, Long collegeId) {
+        return taExamCourseCollegeInspectMapper.findCourseDescriptiveStatisticsForCollege(examId, courseCode, collegeId);
     }
 
     /**

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

@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.service.BasicCourseService;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import com.qmth.teachcloud.report.business.bean.dto.query.BasicExamRecordDto;
 import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseRecord;
@@ -17,7 +15,10 @@ import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseMapper;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseRecordMapper;
-import com.qmth.teachcloud.report.business.service.*;
+import com.qmth.teachcloud.report.business.service.ReportCommonService;
+import com.qmth.teachcloud.report.business.service.TAExamCourseService;
+import com.qmth.teachcloud.report.business.service.TBPaperService;
+import com.qmth.teachcloud.report.business.service.TBPaperStructService;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -43,23 +44,11 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
     @Resource
     TAExamCourseRecordMapper taExamCourseRecordMapper;
 
-    @Resource
-    TBPaperStructService tbPaperStructService;
-
     @Resource
     ReportCommonService reportCommonService;
 
     @Resource
-    TBExamRecordService tbExamRecordService;
-
-    @Resource
-    TBExamCourseService tbExamCourseService;
-
-    @Resource
-    TBExamService tbExamService;
-
-    @Resource
-    BasicCourseService basicCourseService;
+    TBPaperService tbPaperService;
 
     /**
      * 开课课程考试总览列表接口
@@ -72,7 +61,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      */
     @Override
     public IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId) {
-        return taExamCourseMapper.surveyTeacherList(iPage, examId, semester.name(), schoolId);
+        return taExamCourseMapper.surveyTeacherList(iPage, examId, Objects.nonNull(semester) ? semester.name() : null, schoolId);
     }
 
 
@@ -90,11 +79,12 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @param examId
      * @param courseCode
      * @param publishStatus
+     * @param semester
      * @return
      */
     @Override
-    public IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus) {
-        return taExamCourseMapper.surveyAspointsList(iPage, schoolId, examId, courseCode, publishStatus.name());
+    public IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus, SemesterEnum semester) {
+        return taExamCourseMapper.surveyAspointsList(iPage, schoolId, examId, courseCode, Objects.nonNull(publishStatus) ? publishStatus.name() : null, Objects.nonNull(semester) ? semester.name() : null);
     }
 
     @Override
@@ -154,14 +144,12 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
         CollegeAndSchoolGradeDistributionResult collegeAndSchoolGradeDistributionResult = reportCommonService.findCourseDistribution(examId, courseCode, sysUser.getOrgId());
         //学院学科报表维度查询
         DimensionAnalyzeResult dimensionAnalyzeResult = reportCommonService.findDimensionInfo(examId, courseCode, sysUser.getOrgId(), null);
-        //查找试卷结构
-        List<TBPaperStructResult> questionDatasource = tbPaperStructService.findQuestionInfo(examId, courseCode);
         //查找题目相关
-        QuestionInfoResult questionInfoResult = reportCommonService.findSituationOfQuestions(examId, courseCode, sysUser.getOrgId(), questionDatasource);
+        QuestionInfoResult questionInfoResult = reportCommonService.findSituationOfQuestions(examId, courseCode, sysUser.getOrgId(), null);
         //查找老师得分
         TeacherInfoListResult teacherInfoListResult = reportCommonService.findTeacherInfo(examId, courseCode, sysUser.getOrgId());
         //查找题目信息
-        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, sysUser.getOrgId(), questionDatasource);
+        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, sysUser.getOrgId());
 
         return new CollegeAndCourseResult(courseInfoResult, collegeAndSchoolGradeDistributionResult, dimensionAnalyzeResult,
                 questionInfoResult, teacherInfoListResult, questionListResult);
@@ -200,10 +188,8 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
 
         //学院学科报表科目描述
         List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = reportCommonService.surveyTeacherDistribution(examId, courseCode, sysUser.getOrgId());
-        //查找试卷结构
-        List<TBPaperStructResult> questionDatasource = tbPaperStructService.findQuestionInfo(examId, courseCode);
         //查找题目信息
-        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, sysUser.getOrgId(), questionDatasource);
+        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, sysUser.getOrgId());
         return new SurveyTeacherViewResult(surveyTeacherGradeDistributionResultList, questionListResult, surveyTeacherExamCourseResult);
     }
 
@@ -219,7 +205,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      */
     @Override
     public IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, SemesterEnum semester, Long examId, String courseCode) {
-        return taExamCourseMapper.surveyTeacherTeacherView(iPage, schoolId, semester.name(), examId, courseCode);
+        return taExamCourseMapper.surveyTeacherTeacherView(iPage, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode);
     }
 
     /**
@@ -251,75 +237,86 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @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;
+    @Cacheable(value = SystemConstant.TEACHER_ANSWER_VIEW_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode + '-' + #collegeId + '-' + #teacherId")
+    public QuestionInfoResult surveyTeacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId) {
+        return reportCommonService.findSituationOfQuestions(examId, courseCode, collegeId, teacherId);
     }
 
     @Override
-    public TrialCalculationResult trialCalculate(Long examId, String courseCode) {
-        List<String> courseCodeList = new ArrayList<>();
-        courseCodeList.add(courseCode);
+    public TrialCalculationResult trialCalculate(Long examId, String courseCode, BigDecimal coefficient) {
+        // 试卷分数设置
+        List<TBPaper> tbPaperList = tbPaperService.list(new QueryWrapper<TBPaper>().lambda().eq(TBPaper::getExamId, examId).eq(TBPaper::getCourseCode, courseCode));
+        if (tbPaperList.size() == 0) {
+            throw ExceptionResultEnum.ERROR.exception("该课程不存在");
+        }
+        TBPaper tbPaper = tbPaperList.get(0);
+        BigDecimal fullScore = tbPaper.getTotalScore();
+        BigDecimal passScore = tbPaper.getPassScore();
+        // 参考的考生数据
+        List<TAExamCourseRecord> taExamCourseRecordList = taExamCourseRecordMapper.selectList(new QueryWrapper<TAExamCourseRecord>().lambda()
+                .eq(TAExamCourseRecord::getExamId, examId)
+                .eq(TAExamCourseRecord::getCourseCode, courseCode)
+                .eq(TAExamCourseRecord::getAbsent, false));
+        for (TAExamCourseRecord taExamCourseRecord : taExamCourseRecordList) {
+            BigDecimal paperScore = taExamCourseRecord.getTotalScore();
+            BigDecimal assignScore = paperScore.add((fullScore.subtract(paperScore)).divide(coefficient, 4, BigDecimal.ROUND_HALF_UP));
+            assignScore = assignScore.setScale(0, BigDecimal.ROUND_HALF_UP);
+            taExamCourseRecord.setAssignedScore(assignScore);
+        }
+        int totalCount = taExamCourseRecordList.size();
+        int currentCount = (int) taExamCourseRecordList.stream().filter(TAExamCourseRecord::getStudentCurrent).count();
+
+        // 查找卷面数据
+        // 总体
+        List<Double> paperTotalScoreList = taExamCourseRecordList.stream().map(e -> e.getTotalScore().doubleValue()).collect(Collectors.toList());
+        DoubleSummaryStatistics paperTotalStatistics = paperTotalScoreList.stream().collect(Collectors.summarizingDouble(e -> e));
+        double paperTotalAvgScore = paperTotalStatistics.getAverage();
+        long paperTotalFailCount = paperTotalScoreList.stream().filter(e -> e < passScore.doubleValue()).count();
+        BigDecimal paperTotalFailRate = BigDecimal.valueOf(paperTotalFailCount).divide(BigDecimal.valueOf(paperTotalScoreList.size()), 4, BigDecimal.ROUND_HALF_UP);
+
+        // 应届
+        List<Double> paperCurrentScoreList = taExamCourseRecordList.stream().filter(TAExamCourseRecord::getStudentCurrent).map(e -> e.getTotalScore().doubleValue()).collect(Collectors.toList());
+        DoubleSummaryStatistics paperCurrentStatistics = paperCurrentScoreList.stream().collect(Collectors.summarizingDouble(e -> e));
+        double paperCurrentAvgScore = paperCurrentStatistics.getAverage();
+        long paperCurrentFailCount = paperCurrentScoreList.stream().filter(e -> e < passScore.doubleValue()).count();
+        BigDecimal paperCurrentFailRate = BigDecimal.valueOf(paperCurrentFailCount).divide(BigDecimal.valueOf(paperCurrentScoreList.size()), 4, BigDecimal.ROUND_HALF_UP);
+
+        // 查找赋分试算后数据
+        // 总体
+        List<Double> totalScoreList = taExamCourseRecordList.stream().map(e -> e.getAssignedScore().doubleValue()).collect(Collectors.toList());
+        DoubleSummaryStatistics totalStatistics = totalScoreList.stream().collect(Collectors.summarizingDouble(e -> e));
+        double totalAvgScore = totalStatistics.getAverage();
+        long totalFailCount = totalScoreList.stream().filter(e -> e < passScore.doubleValue()).count();
+        BigDecimal totalFailRate = BigDecimal.valueOf(totalFailCount).divide(BigDecimal.valueOf(totalScoreList.size()), 4, BigDecimal.ROUND_HALF_UP);
+
+        // 应届
+        List<Double> currentScoreList = taExamCourseRecordList.stream().filter(TAExamCourseRecord::getStudentCurrent).map(e -> e.getAssignedScore().doubleValue()).collect(Collectors.toList());
+        DoubleSummaryStatistics currentStatistics = currentScoreList.stream().collect(Collectors.summarizingDouble(e -> e));
+        double currentAvgScore = currentStatistics.getAverage();
+        long currentFailCount = currentScoreList.stream().filter(e -> e < passScore.doubleValue()).count();
+        BigDecimal currentFailRate = BigDecimal.valueOf(currentFailCount).divide(BigDecimal.valueOf(currentScoreList.size()), 4, BigDecimal.ROUND_HALF_UP);
+
+        // 组装
+        TrialCalculationResult trialCalculationResult = new TrialCalculationResult();
+        trialCalculationResult.setTotalCount(totalCount);
+        trialCalculationResult.setCurrentCount(currentCount);
+        // - 卷面-总体
+        trialCalculationResult.setAvgScore(BigDecimal.valueOf(paperTotalAvgScore));
+        trialCalculationResult.setFailRate(paperTotalFailRate);
+        trialCalculationResult.setFailCount((int) paperTotalFailCount);
+        // - 卷面-应届
+        trialCalculationResult.setCurrentAvgScore(BigDecimal.valueOf(paperCurrentAvgScore));
+        trialCalculationResult.setCurrentFailRate(paperCurrentFailRate);
+        trialCalculationResult.setCurrentFailCount((int) paperCurrentFailCount);
+        // - 赋分-总体
+        trialCalculationResult.setAvgScoreAssign(BigDecimal.valueOf(totalAvgScore));
+        trialCalculationResult.setFailRateAssign(totalFailRate);
+        trialCalculationResult.setFailCountAssign((int) totalFailCount);
+        // - 赋分-应届
+        trialCalculationResult.setCurrentAvgScoreAssign(BigDecimal.valueOf(currentAvgScore));
+        trialCalculationResult.setCurrentFailRateAssign(currentFailRate);
+        trialCalculationResult.setCurrentFailCountAssign((int) currentFailCount);
 
-//        // 数据同步操作
-//        // 获取当前课程下所有学生考试成绩记录
-//        List<BasicExamRecordDto> basicExamRecordDtoDatasource = tbExamRecordService.findByExamIdAndCourseCodeS(examId, courseCodeList);
-//        for (String s : courseCodeList) {
-//            if (tbExamCourseService.verifyExamCourseCantRun(examId, tbExamService.getById(examId).getSchoolId(), s, basicCourseService.findByCourseCode(s).getName())) {
-//                throw ExceptionResultEnum.ERROR.exception("课程编号[" + s + "]的课程分析数据已测试或发布，不能变更基础数据");
-//            }
-//            List<BasicExamRecordDto> basicExamRecordDtoList = basicExamRecordDtoDatasource.stream()
-//                    .filter(e -> s.equals(e.getCourseCode())).collect(Collectors.toList());
-//            if (basicExamRecordDtoList.size() > 0) {
-//                // 迁移数据至't_a_exam_course_record'
-//                List<TAExamCourseRecord> taExamCourseRecordList = new ArrayList<>();
-//                for (BasicExamRecordDto basicExamRecordDto : basicExamRecordDtoList) {
-//                    boolean absent = basicExamRecordDto.getAbsent();
-//                    // 正常公式赋分操作
-//                    Long paperId = basicExamRecordDto.getPaperId();
-//                    TBPaper tbPaper = tbPaperService.getById(paperId);
-//                    if (Objects.isNull(tbPaper)) {
-//                        throw ExceptionResultEnum.ERROR.exception("试卷信息数据异常");
-//                    }
-//                    BigDecimal fullScore = tbPaper.getTotalScore();
-//                    BigDecimal myScore = basicExamRecordDto.getTotalScore();
-//                    BigDecimal coefficient = tbPaper.getCoefficient();
-//                    BigDecimal assignScore;
-//                    // 当该试卷的赋分系数不为0时赋分
-//                    if (coefficient != null && coefficient.compareTo(BigDecimal.ZERO) > 0 && !absent) {
-//                        assignScore = myScore.add((fullScore.subtract(myScore)).divide(coefficient, 0, BigDecimal.ROUND_HALF_UP));
-//                    } else {
-//                        assignScore = myScore;
-//                    }
-//
-//                    TAExamCourseRecord taExamCourseRecord = new TAExamCourseRecord();
-//                    taExamCourseRecord.setId(SystemConstant.getDbUuid());
-//                    taExamCourseRecord.setExamRecordId(basicExamRecordDto.getTbExamRecordId());
-//                    // 数据同步默认赋分成绩为卷面成绩
-//                    taExamCourseRecord.setSchoolId(tbExamService.getById(examId).getSchoolId());
-//                    taExamCourseRecord.setAssignedScore(assignScore);
-//                    taExamCourseRecord.setExamId(examId);
-//                    taExamCourseRecord.setCourseCode(basicExamRecordDto.getCourseCode());
-//                    taExamCourseRecord.setPaperId(basicExamRecordDto.getPaperId());
-//                    taExamCourseRecord.setPaperType(basicExamRecordDto.getPaperType());
-//                    taExamCourseRecord.setStudentId(basicExamRecordDto.getStudentId());
-//                    taExamCourseRecord.setStudentCode(basicExamRecordDto.getStudentCode());
-//                    taExamCourseRecord.setTeacherId(basicExamRecordDto.getTeacherId());
-//                    taExamCourseRecord.setClazzId(basicExamRecordDto.getClazzId());
-//                    taExamCourseRecord.setTeachCollegeId(basicExamRecordDto.getTeachCollegeId());
-//                    taExamCourseRecord.setInspectCollegeId(basicExamRecordDto.getInspectCollegeId());
-//                    taExamCourseRecord.setMajorId(basicExamRecordDto.getMajorId());
-//                    taExamCourseRecord.setTotalScore(myScore);
-//                    taExamCourseRecord.setAbsent(absent);
-//                    taExamCourseRecord.setStudentCurrent(basicExamRecordDto.getStudentCurrent());
-//                    taExamCourseRecordList.add(taExamCourseRecord);
-//                }
-//                taExamCourseRecordService.saveBatch(taExamCourseRecordList);
-//            }
-//        }
-        return null;
+        return trialCalculationResult;
     }
 }

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

@@ -29,6 +29,9 @@
             <if test="courseCode != null and courseCode != ''">
                 and taecci.course_code = #{courseCode}
             </if>
+            <if test="collegeId != null and collegeId != ''">
+                and taecci.college_id = #{collegeId}
+            </if>
         </where>
     </select>
 
@@ -44,9 +47,13 @@
             round(convert(current_median,decimal(10,4)),2) AS median,
             round(convert(current_lower_quartile,decimal(10,4)),2) AS lowerQuartile,
             current_mode,
-            round(convert(current_standard_deviation,decimal(10,4)),2) AS standardDeviation
+            round(convert(current_standard_deviation,decimal(10,4)),2) AS standardDeviation,
+            tbe.exam_time as examTime,
+            tbe.exam_name as examName
         FROM
             t_a_exam_course taec
+            join t_b_exam tbe
+            on tbe.id = taec.exam_id
         <where>
             <if test="courseCode != null and courseCode != ''">
                 and taec.course_code = #{courseCode}

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

@@ -7,11 +7,10 @@
             tik.paper_type AS paperType,
             tik.`scope`,
             tik.count,
-            tik.sch_avg_score_rate as schAvgScoreRate,
-            tik.col_avg_score_rate as colAvgScoreRate
+            tik.interpret,
+            round(tik.sch_avg_score_rate * 100,2) as schAvgScoreRate,
+            round(tik.col_avg_score_rate * 100,2) 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}

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

@@ -4,14 +4,13 @@
 
     <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
+            tik.paper_type AS paperType,
+            tik.`scope`,
+            tik.count,
+            tik.interpret,
+            round(tik.sch_avg_score_rate * 100,2) as schAvgScoreRate,
+            round(tik.tea_avg_score_rate * 100,2) 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}

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

@@ -124,11 +124,12 @@ public class CourseController {
     @RequestMapping(value = "/survey_aspoints/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
     public Result surveyAspointsList(@ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
+                                     @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                      @ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                      @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode,
                                      @ApiParam(value = "发布状态", required = false) @RequestParam(required = false) PublishStatusEnum publishStatus,
                                      @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                                      @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        return ResultUtil.ok(taExamCourseService.surveyAspointsList(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, publishStatus));
+        return ResultUtil.ok(taExamCourseService.surveyAspointsList(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, publishStatus, semester));
     }
 }

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 参考课程班级维度分析表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-aexam-course-clazz")
-public class TAExamCourseClazzController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 参考课程考查学院维度分析表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-aexam-course-college-inspect")
-public class TAExamCourseCollegeInspectController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 参考课程考查学院各考查点维度表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-aexam-course-college-inspect-dio")
-public class TAExamCourseCollegeInspectDioController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 考试课程维度分析表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t_a_exam_course")
-public class TAExamCourseController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 考试课程，各难度题目得分率表（难度题得分率、中等难度题得分率、简单题得分率） 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-aexam-course-difficult")
-public class TAExamCourseDifficultController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 参考课程试卷考查点（整体情况）维度表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-aexam-course-dio")
-public class TAExamCourseDioController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 参考课程考生成绩维度表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-aexam-course-record")
-public class TAExamCourseRecordController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 参考课程考生各考查点维度分析表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-aexam-course-record-dio")
-public class TAExamCourseRecordDioController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 参考课程考生考查点模块维度表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-aexam-course-record-mod")
-public class TAExamCourseRecordModController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 参考课程授课教师维度表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-aexam-course-teacher")
-public class TAExamCourseTeacherController {
-
-}

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

@@ -1,19 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 授课教师-全校各难度得分率对比 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-16
- */
-@RestController
-@RequestMapping("/t-aexam-course-teacher-difficult")
-public class TAExamCourseTeacherDifficultController {
-
-}

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

@@ -1,19 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 教师维度分析表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-16
- */
-@RestController
-@RequestMapping("/t-aexam-course-teacher-dio")
-public class TAExamCourseTeacherDioController {
-
-}

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

@@ -1,19 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 考试维度总计 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t_a_exam_total")
-public class TAExamTotalController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 试卷结构维度分析表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-apaper-struct")
-public class TAPaperStructController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 基础考生作答记录详情表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-banswer")
-public class TBAnswerController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 云阅卷考试信息表（同步考生成绩使用） 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bcloud-exam")
-public class TBCloudExamController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 等级配置表（试卷难易度、成绩在学院排名百分比） 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bcommon-level-config")
-public class TBCommonLevelConfigController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 学生成绩在学院排名的配置表（赋分成绩在学院排名档次） 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bcommon-rank-level-config")
-public class TBCommonRankLevelConfigController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 考查点维度基础表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bdimension")
-public class TBDimensionController {
-
-}

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

@@ -1,32 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.*;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * <p>
- * 教研分析基础考试信息表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@Api(tags = "考试Controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.common}")
-public class TBExamController {
-
-}

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

@@ -1,19 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 考试科目表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-02
- */
-@RestController
-@RequestMapping("/t-bexam-course")
-public class TBExamCourseController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 考生考试记录 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bexam-record")
-public class TBExamRecordController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 考查点模块配置表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bmodule-config")
-public class TBModuleConfigController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 模块二级考查点维度熟练度配置，及模块简要描述表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bmodule-proficiency")
-public class TBModuleProficiencyController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 试卷基础信息表（赋分系数、试卷类型、满分、及格分等） 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bpaper")
-public class TBPaperController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 试卷结构表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bpaper-struct")
-public class TBPaperStructController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 学校班级表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bschool-clazz")
-public class TBSchoolClazzController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 学校学院基础表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bschool-college")
-public class TBSchoolCollegeController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 课程基础表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bschool-course")
-public class TBSchoolCourseController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 学校专业表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bschool-major")
-public class TBSchoolMajorController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 授课教师表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bschool-teacher")
-public class TBSchoolTeacherController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.report.api;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 基础学生表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2021-06-01
- */
-@RestController
-@RequestMapping("/t-bstudent")
-public class TBStudentController {
-
-}

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

@@ -1,64 +0,0 @@
-//package com.qmth.teachcloud.report.api;
-//
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.qmth.boot.api.constant.ApiConstant;
-//import com.qmth.teachcloud.common.bean.result.TaskListResult;
-//import com.qmth.teachcloud.common.contant.SystemConstant;
-//import com.qmth.teachcloud.common.enums.TaskResultEnum;
-//import com.qmth.teachcloud.common.enums.TaskStatusEnum;
-//import com.qmth.teachcloud.common.enums.TaskTypeEnum;
-//import com.qmth.teachcloud.common.service.TBTaskService;
-//import com.qmth.teachcloud.common.util.Result;
-//import com.qmth.teachcloud.common.util.ResultUtil;
-//import com.qmth.teachcloud.common.util.ServletUtil;
-//import io.swagger.annotations.*;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.annotation.Resource;
-//import java.util.List;
-//import java.util.Objects;
-//
-///**
-// * <p>
-// * 导入导出任务表 前端控制器
-// * </p>
-// *
-// * @author wangliang
-// * @since 2021-03-19
-// */
-//@Api(tags = "数据管理-任务管理Controller")
-//@RestController
-//@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.data}")
-//public class TBTaskController {
-//
-//    @Resource
-//    TBTaskService tbTaskService;
-//
-//    @ApiOperation(value = "任务管理查询接口")
-//    @RequestMapping(value = "/task/query", method = RequestMethod.POST)
-//    @ApiResponses({@ApiResponse(code = 200, message = "任务管理列表信息", response = TaskListResult.class)})
-//    public Result taskQuery(@ApiParam(value = "印刷计划id", required = false) @RequestParam(required = false) String printPlanId,
-//                            @ApiParam(value = "任务状态", required = false) @RequestParam(required = false) TaskStatusEnum status,
-//                            @ApiParam(value = "任务类型", required = false) @RequestParam(required = false) TaskTypeEnum type,
-//                            @ApiParam(value = "任务数据结果", required = false) @RequestParam(required = false) TaskResultEnum result,
-//                            @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-//                            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-//        IPage<TaskListResult> taskListResultIPage = tbTaskService.query(new Page<>(pageNumber, pageSize), Objects.nonNull(ServletUtil.getRequestHeaderSchoolId()) ? Long.parseLong(ServletUtil.getRequestHeaderSchoolId().toString()) : null, SystemConstant.convertIdToLong(printPlanId), status, type, result);
-//        if (Objects.nonNull(taskListResultIPage) && Objects.nonNull(taskListResultIPage.getRecords()) && taskListResultIPage.getRecords().size() > 0) {
-//            List<TaskListResult> taskListResultList = taskListResultIPage.getRecords();
-//            for (TaskListResult taskListResult : taskListResultList) {
-//                if (Objects.equals(taskListResult.getStatus(), TaskStatusEnum.FINISH.getTitle()) && Objects.equals(taskListResult.getResult(), TaskResultEnum.ERROR.getTitle())
-////                        && taskListResult.getResetCount() >= dictionaryConfig.sysDomain().getAutoCreatePdfResetMaxCount()
-//                        && Objects.equals(taskListResult.getType(), TaskTypeEnum.CREATE_PDF.getTitle())
-//                        && Objects.isNull(taskListResult.getErrorMessage())) {
-//                    taskListResult.setResetCreatePdf(true);
-//                }
-//            }
-//        }
-//        return ResultUtil.ok(taskListResultIPage);
-//    }
-//}

teachcloud-report/src/main/resources/application-dev.properties

@@ -10,10 +10,12 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=teachcloud-report
 
 #\u6570\u636E\u6E90\u914D\u7F6E
+#db.host=192.168.10.136
 db.host=localhost
 db.port=3306
 db.name=teachcloud-report
 db.username=root
+#db.password=Qmth87863577!
 db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E

teachcloud-report/src/test/java/com/qmth/teachcloud/report/report/CourseReportTest.java

@@ -1,13 +1,16 @@
 package com.qmth.teachcloud.report.report;
 
+import com.alibaba.fastjson.JSON;
 import com.qmth.teachcloud.report.TeachcloudReportApplication;
 import com.qmth.teachcloud.report.business.service.CourseReportService;
+import com.qmth.teachcloud.report.business.service.TAExamCourseService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 
 /**
  * @Description:
@@ -19,9 +22,20 @@ import javax.annotation.Resource;
 public class CourseReportTest {
     @Resource
     private CourseReportService courseReportService;
+    @Resource
+    private TAExamCourseService taExamCourseService;
 
     @Test
     public void inspectTotal(){
 
     }
+
+    @Test
+    public void trail(){
+        long examId = 1L;
+        String examCode = "1013";
+        BigDecimal coefficient = new BigDecimal("4.5");
+        System.out.println(JSON.toJSONString(taExamCourseService.trialCalculate(examId,examCode,coefficient)));
+    }
+
 }