|
@@ -308,7 +308,7 @@ public class TRBasicInfoController {
|
|
|
}.getType());
|
|
|
for (CourseWeightDto c : obeCourseWeightResult.getSubmitForm()) {
|
|
|
Double score = paperStructDimensionResultList.stream().filter(s -> Objects.equals(s.getCourseTargetName(), c.getCourseTargetName())).mapToDouble(s -> s.getScore().doubleValue()).sum();
|
|
|
- Objects.requireNonNull(c.getTotalWeight(), "[" + c.getCourseTargetName() + "]未设置权重,报告生成失败,请在课程考核设置菜单设置各课程目标所包含考核方式及权重");
|
|
|
+ Objects.requireNonNull(c.getTotalWeight(), "课程目标权重未设置,报告生成失败,请在课程考核设置菜单设置课程的考核方式及权重");
|
|
|
List<CourseWeightDetailDto> courseWeightDetailDtoList = c.getEvaluationList();
|
|
|
for (CourseWeightDetailDto courseWeightDetailDto : courseWeightDetailDtoList) {
|
|
|
if (Objects.equals(courseWeightDetailDto.getEvaluationName(), SystemConstant.FINAL_SCORE_STR)) {
|
|
@@ -445,7 +445,7 @@ public class TRBasicInfoController {
|
|
|
for (CourseWeightDto c : courseWeightDtoList) {
|
|
|
if (Objects.isNull(c.getTotalWeight())) {
|
|
|
reportChangeResult.setTargetScoreChange(true);
|
|
|
- stringJoiner.add("[").add(c.getCourseTargetName()).add("]").add("未设置权重,报告生成失败,请在课程考核设置菜单设置各课程目标所包含考核方式及权重").add("\r\n");
|
|
|
+ stringJoiner.add("课程目标权重未设置,报告生成失败,请在课程考核设置菜单设置课程的考核方式及权重").add("\r\n");
|
|
|
}
|
|
|
}
|
|
|
if (reportChangeResult.isTargetScoreChange()) {
|