提示修改

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(), "[" + c.getCourseTargetName() + "]未设置权重，报告生成失败，请在课程考核设置菜单设置各课程目标所包含考核方式及权重");
             paperStructDimensionResultList.stream().filter(s -> {
                 if (Objects.equals(s.getCourseTargetName(), c.getCourseTargetName())) {
                     s.getTargetList().stream().peek(e -> e.setFinalScoreQuestionScoreSum(new BigDecimal(score))).collect(Collectors.toList());

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

@@ -302,7 +302,7 @@ public class TRBasicInfoController {
 
             TRBasicInfo trBasicInfo = trBasicInfoService.queryBasicInfo(cultureProgramId, courseId, paperNumber);
             Objects.requireNonNull(trBasicInfo, "没有报告信息");
-            Objects.requireNonNull(trBasicInfo.getCourseEvaluationResult(), "没有课程目标信息");
+            Objects.requireNonNull(trBasicInfo.getCourseEvaluationResult(), "未设置课程目标，报告生成失败，请在课程大纲管理菜单设置课程目标");
             Objects.requireNonNull(trBasicInfo.getCourseEvaluationResultDetail(), "没有课程考生信息");
 
             ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId());
@@ -312,7 +312,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(), "[" + c.getCourseTargetName() + "]未设置权重，报告生成失败，请在课程考核设置菜单设置各课程目标所包含考核方式及权重");
                     List<CourseWeightDetailDto> courseWeightDetailDtoList = c.getEvaluationList();
                     for (CourseWeightDetailDto courseWeightDetailDto : courseWeightDetailDtoList) {
                         if (Objects.equals(courseWeightDetailDto.getEvaluationName(), SystemConstant.FINAL_SCORE_STR)) {
@@ -449,7 +449,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(c.getCourseTargetName()).add("]").add("未设置权重，报告生成失败，请在课程考核设置菜单设置各课程目标所包含考核方式及权重").add("\r\n");
                         }
                     }
                     if (reportChangeResult.isTargetScoreChange()) {

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

@@ -1051,12 +1051,12 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
     @Override
     public ObeCourseWeightResult findCourseWeightResultRmi(Long obeCourseOutlineId) {
         ObeCourseWeightResult obeCourseWeightResult = obeCourseWeightService.findCourseWeight(obeCourseOutlineId);
-        Objects.requireNonNull(obeCourseWeightResult, "未设置课程目标数据");
+        Objects.requireNonNull(obeCourseWeightResult, "未设置课程目标，报告生成失败，请在课程大纲管理菜单设置课程目标");
 //        Objects.requireNonNull(obeCourseWeightResult.getWeightSettingSign(), "课程权重变化id为空");
 //        Objects.requireNonNull(obeCourseWeightResult.getDimensionSign(), "知识点变化id为空");
         List<CourseWeightDto> courseWeightDtoList = obeCourseWeightResult.getSubmitForm();
         if (CollectionUtils.isEmpty(courseWeightDtoList)) {
-            throw ExceptionResultEnum.ERROR.exception("未设置课程目标评价方式");
+            throw ExceptionResultEnum.ERROR.exception("未设置考核方式，报告生成失败，请在课程考核设置菜单设置考核方式及权重");
         }
         ObeCourseOutline obeCourseOutline = obeCourseOutlineService.getById(obeCourseOutlineId);
         TCPaperStruct tcPaperStruct = tcPaperStructService.queryPaperStruct(obeCourseOutline.getCultureProgramId(), obeCourseOutline.getCourseId(), null);
@@ -1067,7 +1067,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(), "[" + c.getCourseTargetName() + "]未设置权重，报告生成失败，请在课程考核设置菜单设置各课程目标所包含考核方式及权重");
                 List<CourseWeightDetailDto> courseWeightDetailDtoList = c.getEvaluationList();
                 for (CourseWeightDetailDto courseWeightDetailDto : courseWeightDetailDtoList) {
                     if (Objects.equals(courseWeightDetailDto.getEvaluationName(), SystemConstant.FINAL_SCORE_STR)) {