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

在线管理资源完成情况修改

Browse Source
This commit is contained in:
zhaolongfei
2024-07-17 13:36:34 +08:00
parent 92aa649fa1
commit 00c1fe8c49
2 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,27 +186,7 @@ public class StudyServiceImpl implements IStudyService{
}else if(status==2){ }else if(status==2){
query.addFilter(FieldFilters.eq("progress",100)); query.addFilter(FieldFilters.eq("progress",100));
}else if(status == 1){ }else if(status == 1){
List<StudyCourseItem> studyCourseItemPageList = new ArrayList<>(); query.addFilter(FieldFilters.eq("progress",0));
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());
} }
} }

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

@@ -79,8 +79,12 @@ public class StudySignupServiceImpl implements IStudySignupService{
signupDao.save(signup); signupDao.save(signup);
//添加到课程学习 //添加到课程学习
LocalDateTime now=LocalDateTime.now(); 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<CourseContent> courseContents = contentDao.sqlFindList(sql);
StudyCourse sc=new StudyCourse(); StudyCourse sc=new StudyCourse();
StudyCourseItem scitem =new StudyCourseItem();
sc.setAddTime(now); sc.setAddTime(now);
sc.setAid(signup.getAid()); sc.setAid(signup.getAid());
sc.setAname(signup.getName()); sc.setAname(signup.getName());
@@ -96,6 +100,18 @@ public class StudySignupServiceImpl implements IStudySignupService{
sc.setStatusTime(now); sc.setStatusTime(now);
sc.setLastTime(sc.getAddTime()); sc.setLastTime(sc.getAddTime());
sc.setTotalDuration(0); 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); studyCourseDao.save(sc);
signup.setStudyId(sc.getId()); signup.setStudyId(sc.getId());
//发布到ES //发布到ES
@@ -146,13 +162,8 @@ public class StudySignupServiceImpl implements IStudySignupService{
public void audit(String id, String aid, String user, boolean pass, String remark) { public void audit(String id, String aid, String user, boolean pass, String remark) {
if(pass) { if(pass) {
StudySignup signup =signupDao.get(id); 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<CourseContent> courseContents = contentDao.sqlFindList(sql);
//是否需要检查是否已报名 //是否需要检查是否已报名
StudyCourse sc=new StudyCourse(); StudyCourse sc=new StudyCourse();
StudyCourseItem scitem =new StudyCourseItem();
sc.setAddTime(LocalDateTime.now()); sc.setAddTime(LocalDateTime.now());
sc.setAid(signup.getAid()); sc.setAid(signup.getAid());
sc.setAname(signup.getName()); sc.setAname(signup.getName());
@@ -166,18 +177,6 @@ public class StudySignupServiceImpl implements IStudySignupService{
sc.setStatus(StudyCourse.STATUS_NOSTUDY); sc.setStatus(StudyCourse.STATUS_NOSTUDY);
sc.setStatusTime(sc.getAddTime()); sc.setStatusTime(sc.getAddTime());
sc.setTotalDuration(0); 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); studyCourseDao.save(sc);
} }
signupDao.updateMultiFieldById(id, signupDao.updateMultiFieldById(id,