From 00c1fe8c49b2cdb4fb2e13d5615588c4148f25ef Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 13:36:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudyServiceImpl.java | 22 +----------- .../service/impl/StudySignupServiceImpl.java | 35 +++++++++---------- 2 files changed, 18 insertions(+), 39 deletions(-) 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 0e099884..ef541afb 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 @@ -186,27 +186,7 @@ public class StudyServiceImpl implements IStudyService{ }else if(status==2){ query.addFilter(FieldFilters.eq("progress",100)); }else if(status == 1){ - List studyCourseItemPageList = new ArrayList<>(); - String from= StudyCourse.class.getSimpleName()+" bsc,"+ StudyCourseItem.class.getSimpleName()+" item"; - QueryBuilder builder = QueryBuilder.from(from); - builder.setPageIndex(pageIndex); - builder.setPageSize(pageSize); - builder.addFilter(FieldFilters.eqField("bsc.courseId","item.courseId")); - builder.addFilter(FieldFilters.eq("item.aname", name)); - builder.addFilter(FieldFilters.eq("item.courseId",courseId)); - builder.addFilter(FieldFilters.eq("item.contentId",contentId)); - builder.addFilter(FieldFilters.ne("bsc.status",9)); - builder.addFilter(FieldFilters.ne("bsc.status",2)); -// scItemDao.findPage(builder.builder()); -// for (StudyCourse bsc : scDaoList){ -// StudyCourseItem item = new StudyCourseItem(); -// item.setAid(bsc.getAid()); -// item.setCourseId(bsc.getCourseId()); -// item.setAname(bsc.getAname()); -// item.setProgress(Integer.valueOf(String.valueOf(bsc.getProgress()))); -// studyCourseItemPageList.add(item); -// } - return scItemDao.findPage(builder.builder()); + query.addFilter(FieldFilters.eq("progress",0)); } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java index 42ce2c07..c559761e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java @@ -79,8 +79,12 @@ public class StudySignupServiceImpl implements IStudySignupService{ signupDao.save(signup); //添加到课程学习 LocalDateTime now=LocalDateTime.now(); - + String sql="SELECT c.id,c.content,c.contentName,c.contentRefId,c.contentType,c.courseId," + + "c.csectionId,c.duration,c.rid,c.sortIndex,c.status,c.typeId from boe_course_content c " + + "where c.courseId = '"+signup.getCourseId()+"'"; + List courseContents = contentDao.sqlFindList(sql); StudyCourse sc=new StudyCourse(); + StudyCourseItem scitem =new StudyCourseItem(); sc.setAddTime(now); sc.setAid(signup.getAid()); sc.setAname(signup.getName()); @@ -96,6 +100,18 @@ public class StudySignupServiceImpl implements IStudySignupService{ sc.setStatusTime(now); sc.setLastTime(sc.getAddTime()); sc.setTotalDuration(0); + for (CourseContent c : courseContents){ + scitem.setAname(signup.getName()); + scitem.setAid(signup.getAid()); + scitem.setCourseId(signup.getCourseId()); + scitem.setProgress(0); + scitem.setScore(0f); + scitem.setStudyId(sc.getId()); + scitem.setStatus(1); + scitem.setContentId(c.getId()); + scitem.setContentName(c.getContentName()); + } + scItemDao.save(scitem); studyCourseDao.save(sc); signup.setStudyId(sc.getId()); //发布到ES @@ -146,13 +162,8 @@ public class StudySignupServiceImpl implements IStudySignupService{ public void audit(String id, String aid, String user, boolean pass, String remark) { if(pass) { StudySignup signup =signupDao.get(id); - String sql="SELECT c.id,c.content,c.contentName,c.contentRefId,c.contentType,c.courseId," + - "c.csectionId,c.duration,c.rid,c.sortIndex,c.status,c.typeId from boe_course_content c " + - "where c.courseId = '"+signup.getCourseId()+"'"; - List courseContents = contentDao.sqlFindList(sql); //是否需要检查是否已报名 StudyCourse sc=new StudyCourse(); - StudyCourseItem scitem =new StudyCourseItem(); sc.setAddTime(LocalDateTime.now()); sc.setAid(signup.getAid()); sc.setAname(signup.getName()); @@ -166,18 +177,6 @@ public class StudySignupServiceImpl implements IStudySignupService{ sc.setStatus(StudyCourse.STATUS_NOSTUDY); sc.setStatusTime(sc.getAddTime()); sc.setTotalDuration(0); - for (CourseContent c : courseContents){ - scitem.setAname(signup.getName()); - scitem.setAid(signup.getAid()); - scitem.setCourseId(signup.getCourseId()); - scitem.setProgress(0); - scitem.setScore(0f); - scitem.setStudyId(sc.getId()); - scitem.setStatus(1); - scitem.setContentId(c.getId()); - scitem.setContentName(c.getContentName()); - } - scItemDao.save(scitem); studyCourseDao.save(sc); } signupDao.updateMultiFieldById(id,