|
@@ -176,7 +176,7 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
|
|
|
Objects.requireNonNull(basicCourse, "未找到课程信息");
|
|
|
for (CourseRequirementMatrixDto c : courseRequirementMatrixDtoList) {
|
|
|
if (c.getCourseId().longValue() == basicCourse.getId().longValue()) {
|
|
|
- List<TRBasicInfo> trBasicInfoList = trBasicInfoService.queryBasicInfo(obeCourseOutline.getCultureProgramId(), obeCourseOutline.getCourseId(), null, examId);
|
|
|
+ List<TRBasicInfo> trBasicInfoList = trBasicInfoService.queryBasicInfoAll(obeCourseOutline.getCultureProgramId(), obeCourseOutline.getCourseId(), null, examId);
|
|
|
TRBasicInfo trBasicInfo = !CollectionUtils.isEmpty(trBasicInfoList) ? trBasicInfoList.stream().filter(s -> Objects.nonNull(s.getTeachClassName()) && Objects.equals(s.getTeachClassName(), SystemConstant.ALL)).collect(Collectors.toList()).get(0) : null;
|
|
|
if (Objects.nonNull(trBasicInfo)) {
|
|
|
ReportCourseEvaluationResultDto reportCourseEvaluationResultDto = Objects.nonNull(trBasicInfo.getCourseEvaluationResult()) ? JSONObject.parseObject(trBasicInfo.getCourseEvaluationResult(), ReportCourseEvaluationResultDto.class) : null;
|