diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassCurriculumQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassCurriculumQueryExe.java index 9bc9061..f841715 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassCurriculumQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassCurriculumQueryExe.java @@ -50,11 +50,19 @@ public class ClassCurriculumQueryExe { Map params = PageQueryHelper.toHashMap(classCurriculumPageQry); PageResponse pageResponse = classCurriculumRepository.listPage(params); List examCenterCOS = classCurriculumCoConvertor.converDOsToCOs(pageResponse.getData()); + + + examCenterCOS.stream().forEach(examCenterCO -> { + List classCurriculumChapterDOList = classCurriculumChapterRepository.listByClassCurriculumId(examCenterCO.getClassCurriculumId()); + long videoCount = classCurriculumChapterDOList.stream().filter(bean -> !ObjectUtils.isEmpty(bean.getVideoCoursewareId())).count(); + examCenterCO.setVideoCount(videoCount); + }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } /** * 详情 + * * @param id * @return */ @@ -74,7 +82,7 @@ public class ClassCurriculumQueryExe { public MultiResponse executeListAll(ClassCurriculumQry qry) { Map params = PageQueryHelper.toHashMap(qry); List curList = classCurriculumRepository.listAll(params); - if (curList != null && curList.size() > 0){ + if (curList != null && curList.size() > 0) { List classCurriculumIds = curList.stream().map(ClassCurriculumDO::getClassCurriculumId).collect(Collectors.toList()); List chapterList = classCurriculumChapterRepository.listByClassCurriculumIds(classCurriculumIds); List chapterCoList = classCurriculumChapterCoConvertor.converDOsToCOs(chapterList); diff --git a/web-infrastructure/src/main/resources/mapper/ExamPaperMapper.xml b/web-infrastructure/src/main/resources/mapper/ExamPaperMapper.xml index 1897242..27dbde0 100644 --- a/web-infrastructure/src/main/resources/mapper/ExamPaperMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ExamPaperMapper.xml @@ -36,7 +36,7 @@ and DATE(ep.create_time) =]]> #{params.uploadStartTime} - and DATE(ep.create_time) #{params.uploadStartTime} + and DATE(ep.create_time) #{params.uploadEndTime} order by ep.create_time desc diff --git a/web-infrastructure/src/main/resources/mapper/study/ClassCurriculumMapper.xml b/web-infrastructure/src/main/resources/mapper/study/ClassCurriculumMapper.xml index d9cfcf0..64e01e8 100644 --- a/web-infrastructure/src/main/resources/mapper/study/ClassCurriculumMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/ClassCurriculumMapper.xml @@ -12,6 +12,7 @@ cc.curriculum_name, cc.video_total_time, c.training_type_id, + tt.name as trainingTypeName, c.corpinfo_id, co.corp_name, c.video_total_time curriculumVideoTotalTime, @@ -23,6 +24,7 @@ class_curriculum cc left join curriculum c on c.curriculum_id = cc.curriculum_id left join corp_info co on co.id = c.corpinfo_id + left join training_type tt on tt.training_type_id = c.training_type_id cc.id = #{id}