From 14821e28286d773ad5ff2c13510e39c5eb117daf Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期五, 05 七月 2024 13:46:32 +0800
Subject: [PATCH] update

---
 exam-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentStudyServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentStudyServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentStudyServiceImpl.java
index 60caf9f..05217ea 100644
--- a/exam-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentStudyServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/system/service/impl/ExStudentStudyServiceImpl.java
@@ -64,12 +64,12 @@
     }
 
     @Override
-    public List<StudentStudyVO> selectStudyByPhaseAndStundentId(Long phaseId,Long studentId) {
+    public List<StudentStudyVO> selectStudyByPhaseAndStundentId(Long phaseId,Long studentId,Integer status) {
         ExCoursePhase coursePhase=coursePhaseMapper.selectById(phaseId);
         Long courseId=coursePhase.getCourseId();
         List<ExStudentStudy> studentStudyList= baseMapper.selectStudyByPhaseAndStudentId(phaseId,courseId,studentId);
         Map<Long,ExStudentStudy> studentStudyMap=studentStudyList.stream().collect(Collectors.toMap(ExStudentStudy::getPeriodId, item->item));
-        List<ExCourseChapter> courseChapterList=courseChapterService.selectChapterByCourseId(courseId);
+        List<ExCourseChapter> courseChapterList=courseChapterService.selectChapterByCourseId(courseId, status);
         List<StudentStudyVO> studentStudyVOList=courseChapterList.stream().map(item ->{
             StudentStudyVO studentStudyVO=new StudentStudyVO();
             studentStudyVO.setChapterId(item.getId());
@@ -81,6 +81,7 @@
                 studentStudyPeriodVO.setPeriodName(courseChapterPeriod.getName());
                 studentStudyPeriodVO.setPeriodId(courseChapterPeriod.getId());
                 studentStudyPeriodVO.setPeriod(courseChapterPeriod.getPeriod());
+                studentStudyPeriodVO.setResourceId(courseChapterPeriod.getResourceId());
                 ExStudentStudy exStudentStudy=studentStudyMap.get(courseChapterPeriod.getId());
                 if(exStudentStudy!=null){
                     studentStudyPeriodVO.setProgress(exStudentStudy.getProgress());

--
Gitblit v1.9.2