diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index 16fa2805..e3691a29 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -185,7 +185,7 @@ public class StudyServiceImpl implements IStudyService{ if(status!=null) { if(status==3) { query.addFilter(FieldFilters.gt("progress", 0)); - query.addFilter(FieldFilters.eq("progress", 100)); + query.addFilter(FieldFilters.lt("progress", 100)); return scItemDao.findPage(query.builder()); }else if(status==2){ query.addFilter(FieldFilters.eq("progress",100)); @@ -273,7 +273,8 @@ public class StudyServiceImpl implements IStudyService{ for (Object[] objs : list) { StudyCourseItem sc = new StudyCourseItem(); 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.setProgress(Integer.valueOf(objs[5].toString()));