fix(study): 修复课程查询中的视频数量统计和考试试卷时间筛选问题

web-app/src/main/java/com/zcloud/edu/command/query/study/ClassCurriculumQueryExe.java

@@ -50,11 +50,19 @@ public class ClassCurriculumQueryExe {
         Map<String, Object> params = PageQueryHelper.toHashMap(classCurriculumPageQry);
         PageResponse<ClassCurriculumDO> pageResponse = classCurriculumRepository.listPage(params);
         List<ClassCurriculumCO> examCenterCOS = classCurriculumCoConvertor.converDOsToCOs(pageResponse.getData());
+
+
+        examCenterCOS.stream().forEach(examCenterCO -> {
+            List<ClassCurriculumChapterDO> 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
      */

web-infrastructure/src/main/resources/mapper/ExamPaperMapper.xml

@@ -36,7 +36,7 @@
             and DATE(ep.create_time) <![CDATA[>=]]> #{params.uploadStartTime}
         </if>
         <if test="params.uploadEndTime != null and params.uploadEndTime!=''">
-            and DATE(ep.create_time) <![CDATA[<=]]> #{params.uploadStartTime}
+            and DATE(ep.create_time) <![CDATA[<=]]> #{params.uploadEndTime}
         </if>
         order by  ep.create_time desc
 

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
         <where>
             cc.id = #{id}
         </where>