From cac466ba730db4ef1db394dae26cfe22059c7bc3 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Tue, 19 Aug 2025 16:15:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StudyExamServiceImpl.java    | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
index 4d540a02..665d6fd1 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
@@ -10,6 +10,7 @@ import com.xboe.module.course.entity.CourseExam;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.dao.StudyCourseItemDao;
 import com.xboe.school.study.dao.StudyExamDao;
+import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyExam;
 import com.xboe.school.study.service.IStudyExamService;
@@ -170,15 +171,32 @@ public class StudyExamServiceImpl implements IStudyExamService{
 			}
 			builder.addGroupBy("studyId");
 			List<StudyExam> list1 = dao.findList(builder.builder());
-			log.info("------------QueryBuilder list1.size = " + list1.size() + ",0 = " + list1.get(0));
-
-			for(StudyExam item : list1){
-				log.info("-----------------CourseId = " + item.getCourseId() + " , StudyId = " + item.getStudyId() + " , StudentId = " + item.getStudentId());
-				int totalContent = courseContentDao.getCount(item.getCourseId());
-				log.info("----------准备判断进度-------totalContent = " + totalContent);
-				scDao.finishCheck1(item.getStudyId(),item.getCourseId(),totalContent);
-				log.info("----------判断进度完毕----------------------");
+			if(list1 != null && list1.size() > 0){
+				log.info("----------StudyExam--QueryBuilder list1.size = " + list1.size() + ",0 = " + list1.get(0));
+				for(StudyExam item : list1){
+					log.info("--------------StudyExam---CourseId = " + item.getCourseId() + " , StudyId = " + item.getStudyId() + " , StudentId = " + item.getStudentId());
+					int totalContent = courseContentDao.getCount(item.getCourseId());
+					log.info("--------StudyExam--准备判断进度-------totalContent = " + totalContent);
+					scDao.finishCheck1(item.getStudyId(),item.getCourseId(),totalContent);
+					log.info("--------StudyExam--判断进度完毕----------------------");
+				}
+			}else{
+				QueryBuilder builder1 = QueryBuilder.from(StudyCourse.class);
+				if (StringUtils.isEmpty(courseId)){
+				 	return;
+				}
+				builder1.addFilter(FieldFilters.eq("courseId", courseId));
+				List<StudyCourse> list2 = scDao.findList(builder1.builder());
+				log.info("------------StudyCourse list2.size = " + list2.size() + ",0 = " + list2.get(0));
+				for(StudyCourse item : list2){
+					log.info("-------------StudyCourse----CourseId = " + item.getCourseId() + " , StudyId = " + item.getId() + " , StudentId = " + item.getAid());
+					int totalContent = courseContentDao.getCount(item.getCourseId());
+					log.info("--------StudyCourse--准备判断进度-------totalContent = " + totalContent);
+					scDao.finishCheck1(item.getId(),item.getCourseId(),totalContent);
+					log.info("--------StudyCourse--判断进度完毕----------------------");
+				}
 			}
+
 		} catch (Exception exception) {
 			exception.printStackTrace();
 			log.info("------异常----------------------：" +exception.getMessage());