|
@@ -144,27 +144,6 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
throw ExceptionResultEnum.ERROR.exception("未设置课程目标评价方式");
|
|
throw ExceptionResultEnum.ERROR.exception("未设置课程目标评价方式");
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
for (CourseWeightDto courseWeightDto : courseWeightDtoList) {
|
|
for (CourseWeightDto courseWeightDto : courseWeightDtoList) {
|
|
List<CourseWeightDetailDto> courseWeightDetailDtoList = courseWeightDto.getEvaluationList();
|
|
List<CourseWeightDetailDto> courseWeightDetailDtoList = courseWeightDto.getEvaluationList();
|
|
CourseTargetWordDto courseTargetWordDto = new CourseTargetWordDto(courseWeightDto);
|
|
CourseTargetWordDto courseTargetWordDto = new CourseTargetWordDto(courseWeightDto);
|
|
@@ -176,7 +155,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
if (!CollectionUtils.isEmpty(courseWeightDetailDtoList)) {
|
|
if (!CollectionUtils.isEmpty(courseWeightDetailDtoList)) {
|
|
List<ReportEvaluationDto> reportEvaluationDtoList = new ArrayList<>(courseWeightDetailDtoList.size());
|
|
List<ReportEvaluationDto> reportEvaluationDtoList = new ArrayList<>(courseWeightDetailDtoList.size());
|
|
List<ReportEvaluationDto> usualScoreDetailList = new ArrayList<>(courseWeightDetailDtoList.size());
|
|
List<ReportEvaluationDto> usualScoreDetailList = new ArrayList<>(courseWeightDetailDtoList.size());
|
|
- UsualScoreWordDto usualScoreWordDto = new UsualScoreWordDto(new BigDecimal(30));
|
|
+ UsualScoreWordDto usualScoreWordDto = new UsualScoreWordDto(courseWeightDto.getTotalWeight());
|
|
usualScoreWordDto.setUsualScoreDetailList(usualScoreDetailList);
|
|
usualScoreWordDto.setUsualScoreDetailList(usualScoreDetailList);
|
|
BigDecimal usualScoreTargetSumScore = new BigDecimal(0);
|
|
BigDecimal usualScoreTargetSumScore = new BigDecimal(0);
|
|
for (CourseWeightDetailDto courseWeightDetailDto : courseWeightDetailDtoList) {
|
|
for (CourseWeightDetailDto courseWeightDetailDto : courseWeightDetailDtoList) {
|
|
@@ -203,11 +182,6 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
|
|
paperStructResultMap = paperStructResultList.stream().collect(Collectors.toMap(k -> k.getMainNumber() + "-" + k.getSubNumber(), Function.identity(), (dto1, dto2) -> dto1));
|
|
paperStructResultMap = paperStructResultList.stream().collect(Collectors.toMap(k -> k.getMainNumber() + "-" + k.getSubNumber(), Function.identity(), (dto1, dto2) -> dto1));
|
|
finalScoreResultMap = finalScoreResultList.stream().collect(Collectors.toMap(FinalScoreResult::getStudentCode, Function.identity(), (dto1, dto2) -> dto1));
|
|
finalScoreResultMap = finalScoreResultList.stream().collect(Collectors.toMap(FinalScoreResult::getStudentCode, Function.identity(), (dto1, dto2) -> dto1));
|
|
@@ -360,7 +334,6 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
|
|
} else {
|
|
} else {
|
|
trBasicInfo.setBasicInfo(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber(), basicSemester.getName(), teachingObject, "测试老师1", null);
|
|
trBasicInfo.setBasicInfo(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber(), basicSemester.getName(), teachingObject, "测试老师1", null);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
|
|
ReportCourseBasicInfoDto reportCourseBasicInfoDto = new ReportCourseBasicInfoDto(trBasicInfo);
|
|
ReportCourseBasicInfoDto reportCourseBasicInfoDto = new ReportCourseBasicInfoDto(trBasicInfo);
|
|
trBasicInfo.getReportResult().setCourseBasicInfo(reportCourseBasicInfoDto);
|
|
trBasicInfo.getReportResult().setCourseBasicInfo(reportCourseBasicInfoDto);
|