From df91242e1b86b0c1dc03fd8817a6112d1fd212eb Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 16 Jul 2024 19:57:36 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/IStudyService.java | 2 +- .../study/service/impl/StudyServiceImpl.java | 41 ++++++++++++------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java index 9b25520f..e68608b9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java @@ -94,5 +94,5 @@ public interface IStudyService { * @param status * @return */ - PageList findItemPage(int pageIndex,int pageSize,String contentId,String courseId,String name,Integer status); + PageList findItemPage(int pageIndex, int pageSize, String contentId, String courseId, String name, Integer status); } 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 d6cc2110..393c2d0e 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 @@ -1,6 +1,7 @@ package com.xboe.school.study.service.impl; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -8,7 +9,6 @@ import java.util.Map; import javax.annotation.Resource; import javax.transaction.Transactional; -import com.xboe.api.ThirdApi; import com.xboe.school.study.entity.StudyCourse; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -163,12 +163,11 @@ public class StudyServiceImpl implements IStudyService{ @Override public PageList findItemPage(int pageIndex, int pageSize, String contentId, String courseId,String name,Integer status) { - - QueryBuilder query=QueryBuilder.from(StudyCourseItem.class); - + QueryBuilder query = QueryBuilder.from(StudyCourse.class); + query.setPageIndex(pageIndex); query.setPageSize(pageSize); - + OrderCondition oc=OrderCondition.desc("id"); query.addOrder(oc); if(StringUtils.isNotBlank(contentId)) { @@ -177,18 +176,32 @@ public class StudyServiceImpl implements IStudyService{ if(StringUtils.isNotBlank(courseId)) { query.addFilter(FieldFilters.eq("courseId",courseId)); } - - if(status!=null) { - if(status==1) { - query.addFilter(FieldFilters.eq("progress", 0)); - }else { - query.addFilter(FieldFilters.eq("progress",100)); - } - - } if(StringUtils.isNotBlank(name)) { query.addFilter(FieldFilters.eq("aname", name)); } + if(status!=null) { + if(status==3) { + query.addFilter(FieldFilters.eq("progress", 1)); + }else if(status==2){ + query.addFilter(FieldFilters.eq("progress",100)); + }else if(status == 1){ + List courses = scDao.findList(query.builder()); // 假设这是你的查询方法 + List studyCourseItemPageList = new ArrayList<>(); + query.addFilter(FieldFilters.ne("bsc.status",9)); + query.addFilter(FieldFilters.ne("bsc.status",2)); + scItemDao.findPage(query.builder()); + for (StudyCourse bsc : courses){ + 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 (PageList) studyCourseItemPageList; + } + } + return scItemDao.findPage(query.builder()); } From f19b928bc90f11edf16eed286d794d296ed1f7c8 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 09:05:38 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E9=95=BF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/service/impl/StudyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 393c2d0e..410362c0 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 @@ -163,7 +163,7 @@ public class StudyServiceImpl implements IStudyService{ @Override public PageList findItemPage(int pageIndex, int pageSize, String contentId, String courseId,String name,Integer status) { - QueryBuilder query = QueryBuilder.from(StudyCourse.class); + QueryBuilder query = QueryBuilder.from(StudyCourseItem.class); query.setPageIndex(pageIndex); query.setPageSize(pageSize); From 952f47fdc6f8ee898c10e4b2089ffbe9f5d5f782 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 09:06:31 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/service/impl/StudyServiceImpl.java | 1 - 1 file changed, 1 deletion(-) 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 410362c0..d827ebeb 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 @@ -164,7 +164,6 @@ public class StudyServiceImpl implements IStudyService{ @Override public PageList findItemPage(int pageIndex, int pageSize, String contentId, String courseId,String name,Integer status) { QueryBuilder query = QueryBuilder.from(StudyCourseItem.class); - query.setPageIndex(pageIndex); query.setPageSize(pageSize); From 17943448297d913db888769d2f5930b2871c5398 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 09:37:19 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudyServiceImpl.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 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 d827ebeb..05508233 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 @@ -9,6 +9,8 @@ import java.util.Map; import javax.annotation.Resource; import javax.transaction.Transactional; +import com.xboe.module.article.entity.Article; +import com.xboe.module.interaction.entity.Shares; import com.xboe.school.study.entity.StudyCourse; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -184,12 +186,19 @@ public class StudyServiceImpl implements IStudyService{ }else if(status==2){ query.addFilter(FieldFilters.eq("progress",100)); }else if(status == 1){ - List courses = scDao.findList(query.builder()); // 假设这是你的查询方法 List studyCourseItemPageList = new ArrayList<>(); - query.addFilter(FieldFilters.ne("bsc.status",9)); - query.addFilter(FieldFilters.ne("bsc.status",2)); - scItemDao.findPage(query.builder()); - for (StudyCourse bsc : courses){ + 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")); + query.addFilter(FieldFilters.eq("item.aname", name)); + query.addFilter(FieldFilters.eq("item.courseId",courseId)); + query.addFilter(FieldFilters.eq("item.contentId",contentId)); + builder.addFilter(FieldFilters.ne("bsc.status",9)); + builder.addFilter(FieldFilters.ne("bsc.status",2)); + List scDaoList = scDao.findList(builder.builder()); + for (StudyCourse bsc : scDaoList){ StudyCourseItem item = new StudyCourseItem(); item.setAid(bsc.getAid()); item.setCourseId(bsc.getCourseId()); From 1bd09c0f02066eb07c1ecbd2e9ff1fb7eed0cb7b Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 09:45:50 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudyServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 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 05508233..00977e46 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 @@ -197,16 +197,16 @@ public class StudyServiceImpl implements IStudyService{ query.addFilter(FieldFilters.eq("item.contentId",contentId)); builder.addFilter(FieldFilters.ne("bsc.status",9)); builder.addFilter(FieldFilters.ne("bsc.status",2)); - List scDaoList = scDao.findList(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 (PageList) studyCourseItemPageList; +// 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()); } } From b67d931741a4fe7dec4768e683f06ada1e450aa8 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 10:20:34 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/service/impl/StudyServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 00977e46..4531be76 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 @@ -187,14 +187,14 @@ public class StudyServiceImpl implements IStudyService{ query.addFilter(FieldFilters.eq("progress",100)); }else if(status == 1){ List studyCourseItemPageList = new ArrayList<>(); - String from= StudyCourse.class.getSimpleName()+" bsc,"+ StudyCourseItem.class.getSimpleName()+" item"; + 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")); - query.addFilter(FieldFilters.eq("item.aname", name)); - query.addFilter(FieldFilters.eq("item.courseId",courseId)); - query.addFilter(FieldFilters.eq("item.contentId",contentId)); + 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()); From 019d534956bc2c960a4ba33bd442d52096d7fa4f Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 10:29:27 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/service/impl/StudyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4531be76..0e099884 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 @@ -187,7 +187,7 @@ public class StudyServiceImpl implements IStudyService{ query.addFilter(FieldFilters.eq("progress",100)); }else if(status == 1){ List studyCourseItemPageList = new ArrayList<>(); - String from= StudyCourse.class.getSimpleName()+" bsc "+ StudyCourseItem.class.getSimpleName()+" item"; + String from= StudyCourse.class.getSimpleName()+" bsc,"+ StudyCourseItem.class.getSimpleName()+" item"; QueryBuilder builder = QueryBuilder.from(from); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); From 92aa649fa12a18afd03d6f256e00532e06c61bc3 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 13:22:12 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StudySignupServiceImpl.java | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) 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 6209ef9a..42ce2c07 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 @@ -7,6 +7,10 @@ import java.util.List; import javax.transaction.Transactional; +import com.xboe.module.course.dao.CourseContentDao; +import com.xboe.module.course.entity.CourseContent; +import com.xboe.school.study.dao.StudyCourseItemDao; +import com.xboe.school.study.entity.StudyCourseItem; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,7 +43,13 @@ public class StudySignupServiceImpl implements IStudySignupService{ @Autowired StudyCourseDao studyCourseDao; - + + @Autowired + StudyCourseItemDao scItemDao; + + @Autowired + CourseContentDao contentDao; + @Autowired(required = false) ICourseStudySearch esSearch; @@ -136,9 +146,13 @@ 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()); @@ -152,6 +166,18 @@ 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, 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 09/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=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, From d514450f237da7280cbadc53efa3defca68799d3 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 13:49:24 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/impl/StudySignupServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 c559761e..9288ca4c 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,9 +79,8 @@ 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()+"'"; + String sql="SELECT c.id,,c.content_name,,c.course_id from boe_course_content c " + + "where c.course_id = '"+signup.getCourseId()+"'"; List courseContents = contentDao.sqlFindList(sql); StudyCourse sc=new StudyCourse(); StudyCourseItem scitem =new StudyCourseItem(); From 921aa5909e7bf565b9936fd3c5708b93414a93af Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 13:56:34 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/service/impl/StudySignupServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9288ca4c..a10ee6b9 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,7 +79,7 @@ public class StudySignupServiceImpl implements IStudySignupService{ signupDao.save(signup); //添加到课程学习 LocalDateTime now=LocalDateTime.now(); - String sql="SELECT c.id,,c.content_name,,c.course_id from boe_course_content c " + + String sql="SELECT c.id,c.content_name,c.course_id from boe_course_content c " + "where c.course_id = '"+signup.getCourseId()+"'"; List courseContents = contentDao.sqlFindList(sql); StudyCourse sc=new StudyCourse(); From 99df06481ffa57c3ce518c3f5e2c39a3ba92e132 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 14:30:44 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StudySignupServiceImpl.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) 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 a10ee6b9..9fe39283 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 @@ -99,16 +99,20 @@ 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()); + if (courseContents.size()>0){ + log.info("查看在线课集合内容数据"+courseContents); + for (CourseContent c : courseContents){ + log.info("查看在线课内容数据"+c); + 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); From 588f527293e22f045e8e5fa7500554c0db8cff7c Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 14:40:10 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/entity/CourseContent.java | 17 ++++++++++++++++- .../service/impl/StudySignupServiceImpl.java | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java index a93e159c..f00550f7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java @@ -100,6 +100,21 @@ public class CourseContent extends BaseEntity { this.contentType=contentType; this.contentRefId=contentRefId; } - + @Override + public String toString() { + return "CourseContent{" + + "rid='" + rid + '\'' + + ", typeId='" + typeId + '\'' + + ", courseId='" + courseId + '\'' + + ", csectionId='" + csectionId + '\'' + + ", sortIndex=" + sortIndex + + ", contentType=" + contentType + + ", contentName='" + contentName + '\'' + + ", contentRefId='" + contentRefId + '\'' + + ", content='" + content + '\'' + + ", duration=" + duration + + ", status=" + status + + '}'; + } } 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 9fe39283..739c1cc1 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,8 @@ public class StudySignupServiceImpl implements IStudySignupService{ signupDao.save(signup); //添加到课程学习 LocalDateTime now=LocalDateTime.now(); - String sql="SELECT c.id,c.content_name,c.course_id from boe_course_content c " + - "where c.course_id = '"+signup.getCourseId()+"'"; + String sql="SELECT * from boe_course_content " + + "where course_id = '"+signup.getCourseId()+"'"; List courseContents = contentDao.sqlFindList(sql); StudyCourse sc=new StudyCourse(); StudyCourseItem scitem =new StudyCourseItem(); From e9645d631d4a2a0b0f36d7ec41fc4cca684e7780 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 14:49:55 +0800 Subject: [PATCH 14/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StudySignupServiceImpl.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) 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 739c1cc1..69dc44a8 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 @@ -81,9 +81,7 @@ public class StudySignupServiceImpl implements IStudySignupService{ LocalDateTime now=LocalDateTime.now(); String sql="SELECT * from boe_course_content " + "where course_id = '"+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()); @@ -99,10 +97,13 @@ public class StudySignupServiceImpl implements IStudySignupService{ sc.setStatusTime(now); sc.setLastTime(sc.getAddTime()); sc.setTotalDuration(0); - if (courseContents.size()>0){ - log.info("查看在线课集合内容数据"+courseContents); - for (CourseContent c : courseContents){ - log.info("查看在线课内容数据"+c); + List courseContents = contentDao.sqlFindList(sql); + if (courseContents.size() > 0) { + log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.size()); + for (CourseContent c : courseContents) { + StudyCourseItem scitem = new StudyCourseItem(); + log.info("查看在线课内容数据: {}", c.toString()); // 使用toString()或自定义格式化字符串 + // 设置scitem的属性 scitem.setAname(signup.getName()); scitem.setAid(signup.getAid()); scitem.setCourseId(signup.getCourseId()); @@ -111,10 +112,14 @@ public class StudySignupServiceImpl implements IStudySignupService{ scitem.setStudyId(sc.getId()); scitem.setStatus(1); scitem.setContentId(c.getId()); - //scitem.setContentName(c.getContentName()); + // 如果需要，可以取消注释以下行来设置contentName + // scitem.setContentName(c.getContentName()); + scItemDao.save(scitem); } + } else { + log.info("没有找到在线课内容数据。"); } - scItemDao.save(scitem); + //scItemDao.save(scitem); studyCourseDao.save(sc); signup.setStudyId(sc.getId()); //发布到ES From 63d3844b7670a21a6d0810354bf595651ab373c9 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 15:40:13 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/impl/StudySignupServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 69dc44a8..38852b1e 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 @@ -97,12 +97,13 @@ public class StudySignupServiceImpl implements IStudySignupService{ sc.setStatusTime(now); sc.setLastTime(sc.getAddTime()); sc.setTotalDuration(0); - List courseContents = contentDao.sqlFindList(sql); - if (courseContents.size() > 0) { + List courseContents = contentDao.findListByHql(sql); + if (!courseContents.isEmpty()) { log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.size()); for (CourseContent c : courseContents) { + log.info("查看在线课内容数据: {}", c.toString()); + // 使用toString()或自定义格式化字符串 StudyCourseItem scitem = new StudyCourseItem(); - log.info("查看在线课内容数据: {}", c.toString()); // 使用toString()或自定义格式化字符串 // 设置scitem的属性 scitem.setAname(signup.getName()); scitem.setAid(signup.getAid()); From 2822021f30be64ca500e2f35f2ec5f631223596b Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 16:01:05 +0800 Subject: [PATCH 16/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/impl/StudySignupServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 38852b1e..e111cd20 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 @@ -4,10 +4,12 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; +import java.util.Optional; import javax.transaction.Transactional; import com.xboe.module.course.dao.CourseContentDao; +import com.xboe.module.course.dto.CourseContentDto; import com.xboe.module.course.entity.CourseContent; import com.xboe.school.study.dao.StudyCourseItemDao; import com.xboe.school.study.entity.StudyCourseItem; @@ -80,7 +82,7 @@ public class StudySignupServiceImpl implements IStudySignupService{ //添加到课程学习 LocalDateTime now=LocalDateTime.now(); String sql="SELECT * from boe_course_content " + - "where course_id = '"+signup.getCourseId()+"'"; + "where course_id = '?1'"; StudyCourse sc=new StudyCourse(); sc.setAddTime(now); sc.setAid(signup.getAid()); @@ -97,7 +99,7 @@ public class StudySignupServiceImpl implements IStudySignupService{ sc.setStatusTime(now); sc.setLastTime(sc.getAddTime()); sc.setTotalDuration(0); - List courseContents = contentDao.findListByHql(sql); + List courseContents = contentDao.sqlFindList("SELECT * from boe_course_content where course_id = "+ signup.getCourseId()); if (!courseContents.isEmpty()) { log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.size()); for (CourseContent c : courseContents) { From 34db08d1a81332e4b24a2eddf68bf479cc0ff39d Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 16:24:22 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/study/service/impl/StudySignupServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e111cd20..d6b77f59 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 @@ -101,9 +101,9 @@ public class StudySignupServiceImpl implements IStudySignupService{ sc.setTotalDuration(0); List courseContents = contentDao.sqlFindList("SELECT * from boe_course_content where course_id = "+ signup.getCourseId()); if (!courseContents.isEmpty()) { - log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.size()); + log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.toString()); for (CourseContent c : courseContents) { - log.info("查看在线课内容数据: {}", c.toString()); + log.info("查看在线课内容数据: {}", c); // 使用toString()或自定义格式化字符串 StudyCourseItem scitem = new StudyCourseItem(); // 设置scitem的属性 From d60a1521f95e11c1f13cc6ab845bdcb87d7c3213 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 16:48:38 +0800 Subject: [PATCH 18/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97,=E5=85=88?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudySignupServiceImpl.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 d6b77f59..91853248 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 @@ -81,8 +81,6 @@ public class StudySignupServiceImpl implements IStudySignupService{ signupDao.save(signup); //添加到课程学习 LocalDateTime now=LocalDateTime.now(); - String sql="SELECT * from boe_course_content " + - "where course_id = '?1'"; StudyCourse sc=new StudyCourse(); sc.setAddTime(now); sc.setAid(signup.getAid()); @@ -102,8 +100,7 @@ public class StudySignupServiceImpl implements IStudySignupService{ List courseContents = contentDao.sqlFindList("SELECT * from boe_course_content where course_id = "+ signup.getCourseId()); if (!courseContents.isEmpty()) { log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.toString()); - for (CourseContent c : courseContents) { - log.info("查看在线课内容数据: {}", c); + //log.info("查看在线课内容数据: {}", c); // 使用toString()或自定义格式化字符串 StudyCourseItem scitem = new StudyCourseItem(); // 设置scitem的属性 @@ -114,14 +111,14 @@ public class StudySignupServiceImpl implements IStudySignupService{ scitem.setScore(0f); scitem.setStudyId(sc.getId()); scitem.setStatus(1); - scitem.setContentId(c.getId()); + //scitem.setContentId(c.getId()); // 如果需要，可以取消注释以下行来设置contentName // scitem.setContentName(c.getContentName()); scItemDao.save(scitem); } - } else { - log.info("没有找到在线课内容数据。"); - } +// } else { +// log.info("没有找到在线课内容数据。"); +// } //scItemDao.save(scitem); studyCourseDao.save(sc); signup.setStudyId(sc.getId()); From bed3bd7fae7fbec97ff2fc9612989e8e8bf319a8 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 16:56:15 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97,=E5=85=88?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudySignupServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 91853248..efcc96ba 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 @@ -97,11 +97,12 @@ public class StudySignupServiceImpl implements IStudySignupService{ sc.setStatusTime(now); sc.setLastTime(sc.getAddTime()); sc.setTotalDuration(0); - List courseContents = contentDao.sqlFindList("SELECT * from boe_course_content where course_id = "+ signup.getCourseId()); - if (!courseContents.isEmpty()) { - log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.toString()); +// List courseContents = contentDao.sqlFindList("SELECT * from boe_course_content where course_id = "+ signup.getCourseId()); +// if (!courseContents.isEmpty()) { +// log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.toString()); //log.info("查看在线课内容数据: {}", c); // 使用toString()或自定义格式化字符串 + log.info("查看在线课内容数据: {}", sc.getId()); StudyCourseItem scitem = new StudyCourseItem(); // 设置scitem的属性 scitem.setAname(signup.getName()); @@ -115,7 +116,7 @@ public class StudySignupServiceImpl implements IStudySignupService{ // 如果需要，可以取消注释以下行来设置contentName // scitem.setContentName(c.getContentName()); scItemDao.save(scitem); - } +// } // } else { // log.info("没有找到在线课内容数据。"); // } From 69b6a500115ebe2e91bd5a6c65ac539166f3c1d6 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 18:30:47 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97,=E5=85=88?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/IStudySignupService.java | 8 +++ .../service/impl/StudySignupServiceImpl.java | 51 ++++++++++--------- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudySignupService.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudySignupService.java index 94515890..26307b67 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudySignupService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudySignupService.java @@ -6,6 +6,7 @@ import com.xboe.common.OrderCondition; import com.xboe.common.PageList; import com.xboe.common.beans.KeyValue; import com.xboe.school.study.entity.StudyCourse; +import com.xboe.school.study.entity.StudyCourseItem; import com.xboe.school.study.entity.StudySignup; /** @@ -48,6 +49,13 @@ public interface IStudySignupService { * @param signup */ StudyCourse addSignup(StudySignup signup); + + + /** + * 管理员添加报名课件 + * @param signup + */ + StudyCourseItem addStudyCourseItem(StudySignup signup); /** * 删除报名，只有未审核过的才可以删除 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 efcc96ba..b4e09ed6 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 @@ -97,30 +97,6 @@ public class StudySignupServiceImpl implements IStudySignupService{ sc.setStatusTime(now); sc.setLastTime(sc.getAddTime()); sc.setTotalDuration(0); -// List courseContents = contentDao.sqlFindList("SELECT * from boe_course_content where course_id = "+ signup.getCourseId()); -// if (!courseContents.isEmpty()) { -// log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.toString()); - //log.info("查看在线课内容数据: {}", c); - // 使用toString()或自定义格式化字符串 - log.info("查看在线课内容数据: {}", sc.getId()); - StudyCourseItem scitem = new StudyCourseItem(); - // 设置scitem的属性 - 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()); - // 如果需要，可以取消注释以下行来设置contentName - // scitem.setContentName(c.getContentName()); - scItemDao.save(scitem); -// } -// } else { -// log.info("没有找到在线课内容数据。"); -// } - //scItemDao.save(scitem); studyCourseDao.save(sc); signup.setStudyId(sc.getId()); //发布到ES @@ -159,11 +135,38 @@ public class StudySignupServiceImpl implements IStudySignupService{ //courseDao.updateMultiFieldById(signup.getCourseId(),UpdateBuilder.create("studys", "studys+1",FieldUpdateType.EXPRESSION)); } + @Override + public StudyCourseItem addStudyCourseItem(StudySignup signup) { + List courseContents = contentDao.sqlFindList("SELECT * from boe_course_content where course_id = "+ signup.getCourseId()); + if (!courseContents.isEmpty()) { + log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.toString()); + for (CourseContent c : courseContents){ + log.info("查看在线课内容数据: {}", c); + // 使用toString()或自定义格式化字符串 + StudyCourseItem scitem = new StudyCourseItem(); + // 设置scitem的属性 + scitem.setAname(signup.getName()); + scitem.setAid(signup.getAid()); + scitem.setCourseId(signup.getCourseId()); + scitem.setProgress(0); + scitem.setScore(0f); + scitem.setStatus(1); + scitem.setContentId(signup.getStudyId()); + // 如果需要，可以取消注释以下行来设置contentName + // scitem.setContentName(c.getContentName()); + scItemDao.save(scitem); + } + } else { + log.info("没有找到在线课内容数据。"); + } + return null; + } @Override public void addList(List list) { //用于管理员添加报名 for(StudySignup ss : list) { addSignup(ss); + addStudyCourseItem(ss); } } From 16c755d14dcda456b93e51c263cf3c1325e50070 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 18:40:04 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97,=E5=85=88?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StudySignupServiceImpl.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) 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 b4e09ed6..7f7f629d 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 @@ -141,20 +141,21 @@ public class StudySignupServiceImpl implements IStudySignupService{ if (!courseContents.isEmpty()) { log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.toString()); for (CourseContent c : courseContents){ - log.info("查看在线课内容数据: {}", c); - // 使用toString()或自定义格式化字符串 - StudyCourseItem scitem = new StudyCourseItem(); - // 设置scitem的属性 - scitem.setAname(signup.getName()); - scitem.setAid(signup.getAid()); - scitem.setCourseId(signup.getCourseId()); - scitem.setProgress(0); - scitem.setScore(0f); - scitem.setStatus(1); - scitem.setContentId(signup.getStudyId()); - // 如果需要，可以取消注释以下行来设置contentName - // scitem.setContentName(c.getContentName()); - scItemDao.save(scitem); + log.info("查看在线课内容数据: {}", c); + // 使用toString()或自定义格式化字符串 + StudyCourseItem scitem = new StudyCourseItem(); + // 设置scitem的属性 + scitem.setAname(signup.getName()); + scitem.setAid(signup.getAid()); + scitem.setCourseId(signup.getCourseId()); + scitem.setProgress(0); + scitem.setScore(0f); + scitem.setStatus(1); + scitem.setContentId(c.getId()); + scitem.setStudyId(signup.getStudyId()); + // 如果需要，可以取消注释以下行来设置contentName + // scitem.setContentName(c.getContentName()); + scItemDao.save(scitem); } } else { log.info("没有找到在线课内容数据。"); From fee3f263bcd761e50215351473f02af9f81c57ca Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 19:14:58 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97,=E5=85=88?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/course/dao/CourseContentDao.java | 8 ++++++++ .../school/study/service/impl/StudySignupServiceImpl.java | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java index b945ea63..e1f7aeca 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java @@ -1,10 +1,13 @@ package com.xboe.module.course.dao; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; import com.xboe.core.orm.BaseDao; import com.xboe.module.course.entity.CourseContent; +import java.util.List; + @Repository public class CourseContentDao extends BaseDao { @@ -20,4 +23,9 @@ public class CourseContentDao extends BaseDao { int count=count(hql, courseId); return count; } + + public List findContentList(String courseId) { + String sql = "select * from CourseContent c where c.courseId = ?1"; + return findList(sql, courseId); + } } 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 7f7f629d..4adbdfcd 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 @@ -137,9 +137,9 @@ public class StudySignupServiceImpl implements IStudySignupService{ @Override public StudyCourseItem addStudyCourseItem(StudySignup signup) { - List courseContents = contentDao.sqlFindList("SELECT * from boe_course_content where course_id = "+ signup.getCourseId()); + List courseContents = contentDao.findContentList(signup.getCourseId()); if (!courseContents.isEmpty()) { - log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.toString()); + log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.size()); for (CourseContent c : courseContents){ log.info("查看在线课内容数据: {}", c); // 使用toString()或自定义格式化字符串 From 312108e6c0711648e032e4b19ade6efa1b5d5335 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 19:28:08 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97,=E5=85=88?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/dao/CourseContentDao.java | 4 ---- .../study/service/impl/StudySignupServiceImpl.java | 9 +++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java index e1f7aeca..0f1046d6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseContentDao.java @@ -24,8 +24,4 @@ public class CourseContentDao extends BaseDao { return count; } - public List findContentList(String courseId) { - String sql = "select * from CourseContent c where c.courseId = ?1"; - return findList(sql, courseId); - } } 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 4adbdfcd..b2851a6c 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 @@ -137,11 +137,12 @@ public class StudySignupServiceImpl implements IStudySignupService{ @Override public StudyCourseItem addStudyCourseItem(StudySignup signup) { - List courseContents = contentDao.findContentList(signup.getCourseId()); + String sql = "select id,course_id,content_name from boe_course_content where course_id = '"+signup.getCourseId()+"'"; + List courseContents = contentDao.sqlFindList(sql); if (!courseContents.isEmpty()) { log.info("查看在线课集合内容数据（共 {} 条记录）", courseContents.size()); - for (CourseContent c : courseContents){ - log.info("查看在线课内容数据: {}", c); + for (Object[] objs : courseContents){ + log.info("查看在线课内容数据: {}", objs[0].toString()); // 使用toString()或自定义格式化字符串 StudyCourseItem scitem = new StudyCourseItem(); // 设置scitem的属性 @@ -151,7 +152,7 @@ public class StudySignupServiceImpl implements IStudySignupService{ scitem.setProgress(0); scitem.setScore(0f); scitem.setStatus(1); - scitem.setContentId(c.getId()); + scitem.setContentId((String) objs[0]); scitem.setStudyId(signup.getStudyId()); // 如果需要，可以取消注释以下行来设置contentName // scitem.setContentName(c.getContentName()); From 46b63c36eb603ea6c80c6e50d083a5b2e5262c30 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 17 Jul 2024 19:33:50 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97,=E5=85=88?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/service/impl/StudySignupServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b2851a6c..d9345ba2 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 @@ -152,7 +152,7 @@ public class StudySignupServiceImpl implements IStudySignupService{ scitem.setProgress(0); scitem.setScore(0f); scitem.setStatus(1); - scitem.setContentId((String) objs[0]); + scitem.setContentId(objs[0].toString()); scitem.setStudyId(signup.getStudyId()); // 如果需要，可以取消注释以下行来设置contentName // scitem.setContentName(c.getContentName());