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 e56341a5..fe4bd960 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 @@ -19,6 +19,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.Collection; +import java.util.List; +import java.util.Optional; import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.ForkJoinPool; 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 d6ba5aaf..eba72061 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);