hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-12 04:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy0731-llf' into dev0525

Browse Source 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
This commit is contained in:
nisen
2024-08-02 10:18:24 +08:00
parent a13ad69e1f 19df4224a9
commit 0e7e11b3f1
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
View File

@@ -19,6 +19,9 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinPool;

6
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
View File

@@ -61,10 +61,10 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
if (sci.getId()!=null || sci.getId()!=""){ if (sci.getId()!=null || sci.getId()!=""){
homework.setStudyItemId(sci.getId()); homework.setStudyItemId(sci.getId());
dao.save(homework); 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 { }else {
//只是保留一条作业记录，不再保存多条记录了 //只是保留一条作业记录，不再保存多条记录了
//dao.save(homework); //dao.save(homework);