|
@@ -78,6 +78,7 @@ public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, Cou
|
|
List<CourseDimensionDto> dimensionList = courseTarget.getDimensionList();
|
|
List<CourseDimensionDto> dimensionList = courseTarget.getDimensionList();
|
|
String degreeRequirement = courseTarget.getDegreeRequirement();
|
|
String degreeRequirement = courseTarget.getDegreeRequirement();
|
|
BigDecimal totalWeight = courseTarget.getTotalWeight();
|
|
BigDecimal totalWeight = courseTarget.getTotalWeight();
|
|
|
|
+ BigDecimal totalScore = new BigDecimal(0);
|
|
|
|
|
|
List<CourseWeightDetailDto> courseWeightDetailDtoList = new ArrayList<>();
|
|
List<CourseWeightDetailDto> courseWeightDetailDtoList = new ArrayList<>();
|
|
for (CourseEvaluationResult courseEvaluationResult : courseEvaluationResultList) {
|
|
for (CourseEvaluationResult courseEvaluationResult : courseEvaluationResultList) {
|
|
@@ -101,6 +102,9 @@ public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, Cou
|
|
detail.setEnable(enable);
|
|
detail.setEnable(enable);
|
|
detail.setWeight(weight);
|
|
detail.setWeight(weight);
|
|
detail.setTargetScore(targetScore);
|
|
detail.setTargetScore(targetScore);
|
|
|
|
+ if (enable){
|
|
|
|
+ totalScore = totalScore.add(targetScore);
|
|
|
|
+ }
|
|
courseWeightDetailDtoList.add(detail);
|
|
courseWeightDetailDtoList.add(detail);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -110,6 +114,7 @@ public class CourseWeightServiceImpl extends ServiceImpl<CourseWeightMapper, Cou
|
|
courseWeightDto.setDimensionList(dimensionList);
|
|
courseWeightDto.setDimensionList(dimensionList);
|
|
courseWeightDto.setDegreeRequirement(degreeRequirement);
|
|
courseWeightDto.setDegreeRequirement(degreeRequirement);
|
|
courseWeightDto.setTotalWeight(totalWeight);
|
|
courseWeightDto.setTotalWeight(totalWeight);
|
|
|
|
+ courseWeightDto.setTotalScore(totalScore);
|
|
courseWeightDto.setEvaluationList(courseWeightDetailDtoList);
|
|
courseWeightDto.setEvaluationList(courseWeightDetailDtoList);
|
|
result.add(courseWeightDto);
|
|
result.add(courseWeightDto);
|
|
}
|
|
}
|