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

Merge branch 'zcwy0716-llf' into master-0705

Browse Source
This commit is contained in:
nisen
2024-07-26 22:11:30 +08:00
parent f8566d2321 2f8163b0a3
commit 6f19ff7b0f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,7 +185,7 @@ public class StudyServiceImpl implements IStudyService{
if(status!=null) { if(status!=null) {
if(status==3) { if(status==3) {
query.addFilter(FieldFilters.gt("progress", 0)); query.addFilter(FieldFilters.gt("progress", 0));
query.addFilter(FieldFilters.eq("progress", 100)); query.addFilter(FieldFilters.lt("progress", 100));
return scItemDao.findPage(query.builder()); return scItemDao.findPage(query.builder());
}else if(status==2){ }else if(status==2){
query.addFilter(FieldFilters.eq("progress",100)); query.addFilter(FieldFilters.eq("progress",100));
@@ -273,7 +273,8 @@ public class StudyServiceImpl implements IStudyService{
for (Object[] objs : list) { for (Object[] objs : list) {
StudyCourseItem sc = new StudyCourseItem(); StudyCourseItem sc = new StudyCourseItem();
if (!"0".equals(objs[4].toString())) { if (!"0".equals(objs[4].toString())) {
LocalDateTime finishTime = LocalDateTime.parse(objs[4].toString()); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime finishTime = LocalDateTime.parse(objs[4].toString(), formatter);
sc.setFinishTime(finishTime); sc.setFinishTime(finishTime);
} }
sc.setProgress(Integer.valueOf(objs[5].toString())); sc.setProgress(Integer.valueOf(objs[5].toString()));