瀏覽代碼

提示修改

wangliang 9 月之前
父節點
當前提交
f4315c4131

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TCPaperStructController.java

@@ -167,7 +167,7 @@ public class TCPaperStructController {
             }
             List<PaperStructDimensionResult> paperStructDimensionResultList = paperStructParams.getPaperStruct();
             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(), "课程目标权重未设置,报告生成失败,请在课程考核设置菜单设置课程的考核方式及权重");
             paperStructDimensionResultList.stream().filter(s -> {
                 if (Objects.equals(s.getCourseTargetName(), c.getCourseTargetName())) {
                     s.getTargetList().stream().peek(e -> e.setFinalScoreQuestionScoreSum(new BigDecimal(score))).collect(Collectors.toList());

+ 2 - 2
distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TRBasicInfoController.java

@@ -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()) {

+ 2 - 2
teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/TRBasicInfoServiceImpl.java

@@ -1061,7 +1061,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
         }
         if (vaildWeight) {
             for (CourseWeightDto c : obeCourseWeightResult.getSubmitForm()) {
-                Objects.requireNonNull(c.getTotalWeight(), "[" + c.getCourseTargetName() + "]未设置权重,报告生成失败,请在课程考核设置菜单设置各课程目标所包含考核方式及权重");
+                Objects.requireNonNull(c.getTotalWeight(), "课程目标权重未设置,报告生成失败,请在课程考核设置菜单设置课程的考核方式及权重");
             }
         }
 
@@ -1073,7 +1073,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
             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)) {