达成度异常信息修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradeBatchServiceImpl.java

@@ -458,9 +458,7 @@ public class GradeBatchServiceImpl extends ServiceImpl<GradeBatchMapper, GradeBa
 
             Long courseId = markPaper.getCourseId();
             BasicCourse basicCourse = basicCourseService.getById(courseId);
-            if (Objects.isNull(basicCourse)) {
-                throw ExceptionResultEnum.ERROR.exception("未找到课程信息");
-            }
+            Objects.requireNonNull(basicCourse, "未找到课程信息");
 
             Long courseSecondaryOrgId = basicCourse.getTeachingRoomId();
 

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

@@ -161,9 +161,7 @@ public class TCFinalScoreController {
     public Result finalScoreSyncChoosePaper(@ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
                                             @ApiParam(value = "科目编码") @RequestParam(required = false) Long courseId) {
         BasicCourse basicCourse = basicCourseService.getById(courseId);
-        if (Objects.isNull(basicCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("未找到课程");
-        }
+        Objects.requireNonNull(basicCourse, "未找到课程信息");
         return ResultUtil.ok(markPaperService.list(new QueryWrapper<MarkPaper>().lambda().eq(MarkPaper::getExamId, examId).eq(MarkPaper::getCourseId, basicCourse.getId()).eq(MarkPaper::getStatus, MarkPaperStatus.FINISH)));
     }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -345,9 +345,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public AssignTeacherDto listUser(Long courseId, String param) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         BasicCourse basicCourse = basicCourseService.getById(courseId);
-        if (Objects.isNull(basicCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("找不到此课程信息");
-        }
+        Objects.requireNonNull(basicCourse, "未找到课程信息");
         return listUserCommon(basicCourse, schoolId);
     }
 

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

@@ -159,9 +159,7 @@ public class ObeCourseDimensionServiceImpl extends ServiceImpl<ObeCourseDimensio
         Long schoolId = courseOutline.getSchoolId();
         Long courseId = courseOutline.getCourseId();
         BasicCourse basicCourse = basicCourseService.getById(courseId);
-        if (Objects.isNull(basicCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("基础课程不存在");
-        }
+        Objects.requireNonNull(basicCourse, "未找到课程信息");
 
         List<ObeCourseDimension> obeCourseDimensionList = this.list(new QueryWrapper<ObeCourseDimension>().lambda().eq(ObeCourseDimension::getObeCourseOutlineId, obeCourseOutlineId));
 

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

@@ -170,9 +170,9 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
             Map<Long, CourseTargetWebDto> courseTargetWebDtoMap = new HashMap<>();//课程目标集合
 
             ObeCourseOutline obeCourseOutline = obeCourseOutlineService.getById(obeCourseOutlineId);
-            Objects.requireNonNull(obeCourseOutline, "课程大纲为空");
+            Objects.requireNonNull(obeCourseOutline, "未找到课程大纲信息");
             BasicCourse basicCourse = basicCourseService.getById(obeCourseOutline.getCourseId());
-            Objects.requireNonNull(basicCourse, "科目信息为空");
+            Objects.requireNonNull(basicCourse, "未找到课程信息");
             for (CourseRequirementMatrixDto c : courseRequirementMatrixDtoList) {
                 if (c.getCourseId().longValue() == basicCourse.getId().longValue()) {
                     TRBasicInfo trBasicInfo = trBasicInfoService.queryBasicInfo(obeCourseOutline.getCultureProgramId(), obeCourseOutline.getCourseId(), null);

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

@@ -71,9 +71,7 @@ public class TCUsualScoreServiceImpl extends ServiceImpl<TCUsualScoreMapper, TCU
         Map<String, String> messageMap = new LinkedHashMap<>();
 
         BasicCourse basicCourse = basicCourseService.getById(courseId);
-        if (Objects.isNull(basicCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("课程不存在");
-        }
+        Objects.requireNonNull(basicCourse, "未找到课程信息");
 
         try {
             Double totalScore = 100d;

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

@@ -1052,8 +1052,8 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
     public ObeCourseWeightResult findCourseWeightResultRmi(Long obeCourseOutlineId) {
         ObeCourseWeightResult obeCourseWeightResult = obeCourseWeightService.findCourseWeight(obeCourseOutlineId);
         Objects.requireNonNull(obeCourseWeightResult, "未设置课程目标数据");
-        Objects.requireNonNull(obeCourseWeightResult.getWeightSettingSign(), "课程权重变化id为空");
-        Objects.requireNonNull(obeCourseWeightResult.getDimensionSign(), "知识点变化id为空");
+//        Objects.requireNonNull(obeCourseWeightResult.getWeightSettingSign(), "课程权重变化id为空");
+//        Objects.requireNonNull(obeCourseWeightResult.getDimensionSign(), "知识点变化id为空");
         List<CourseWeightDto> courseWeightDtoList = obeCourseWeightResult.getSubmitForm();
         if (CollectionUtils.isEmpty(courseWeightDtoList)) {
             throw ExceptionResultEnum.ERROR.exception("未设置课程目标评价方式");
@@ -1134,8 +1134,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
         String college = null;
         if (Objects.isNull(trBasicInfo) || Objects.isNull(trBasicInfo.getCollege())) {
             BasicCourse basicCourse = basicCourseService.getById(obeCourseOutline.getCourseId());
-            Objects.requireNonNull(basicCourse, "科目信息为空");
-
+            Objects.requireNonNull(basicCourse, "未找到课程信息");
             if (Objects.nonNull(basicCourse.getTeachingRoomId())) {
                 SysOrg sysOrg = sysOrgService.getById(basicCourse.getTeachingRoomId());
                 if (Objects.nonNull(sysOrg)) {