diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java index b9b6155e..831e2299 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java @@ -12,13 +12,10 @@ import com.xboe.module.dict.entity.DictDto; import com.xboe.module.exam.entity.ExamTest; import com.xboe.school.study.entity.StudyCourse; import com.xboe.system.user.dao.UserDao; -import com.xboe.system.user.entity.User; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java index 83e0c8ef..8e53ede2 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java @@ -61,10 +61,10 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{ if (sci.getId()!=null || sci.getId()!=""){ homework.setStudyItemId(sci.getId()); dao.save(homework); + //检查是否全部学习完成 + int totalContent=courseContentDao.count(FieldFilters.eq("courseId", homework.getCourseId()),FieldFilters.eq("deleted",false)); + scDao.finishCheck(homework.getStudyId(),homework.getCourseId(),totalContent,token); } - //检查是否全部学习完成 - int totalContent=courseContentDao.count(FieldFilters.eq("courseId", homework.getCourseId()),FieldFilters.eq("deleted",false)); - scDao.finishCheck(homework.getStudyId(),homework.getCourseId(),totalContent,token); }else { //只是保留一条作业记录,不再保存多条记录了 //dao.save(homework);