From 6d4a82ab679b0b49729c4a4e4c9e91228ca22384 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Thu, 11 Jun 2026 09:34:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(study):=20=E4=BF=AE=E5=A4=8D=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=92=8C=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../command/query/study/ClassCurriculumQueryExe.java   | 10 +++++++++-
 .../src/main/resources/mapper/ExamPaperMapper.xml      |  2 +-
 .../resources/mapper/study/ClassCurriculumMapper.xml   |  2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

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<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
      */
@@ -74,7 +82,7 @@ public class ClassCurriculumQueryExe {
     public MultiResponse<ClassCurriculumCO> executeListAll(ClassCurriculumQry qry) {
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
         List<ClassCurriculumDO> curList = classCurriculumRepository.listAll(params);
-        if (curList != null && curList.size() > 0){
+        if (curList != null && curList.size() > 0) {
             List<String> classCurriculumIds = curList.stream().map(ClassCurriculumDO::getClassCurriculumId).collect(Collectors.toList());
             List<ClassCurriculumChapterDO> chapterList = classCurriculumChapterRepository.listByClassCurriculumIds(classCurriculumIds);
             List<ClassCurriculumChapterCO> 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) <![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
 
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
         <where>
             cc.id = #{id}
         </where>