mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-08 10:26:48 +08:00
Merge branch 'zcwy0716-llf' into dev0525
This commit is contained in:
@@ -6,6 +6,7 @@ import com.xboe.common.OrderCondition;
|
|||||||
import com.xboe.common.PageList;
|
import com.xboe.common.PageList;
|
||||||
import com.xboe.common.beans.KeyValue;
|
import com.xboe.common.beans.KeyValue;
|
||||||
import com.xboe.school.study.entity.StudyCourse;
|
import com.xboe.school.study.entity.StudyCourse;
|
||||||
|
import com.xboe.school.study.entity.StudyCourseItem;
|
||||||
import com.xboe.school.study.entity.StudySignup;
|
import com.xboe.school.study.entity.StudySignup;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -48,6 +49,13 @@ public interface IStudySignupService {
|
|||||||
* @param signup
|
* @param signup
|
||||||
*/
|
*/
|
||||||
StudyCourse addSignup(StudySignup signup);
|
StudyCourse addSignup(StudySignup signup);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 管理员添加报名课件
|
||||||
|
* @param signup
|
||||||
|
*/
|
||||||
|
StudyCourseItem addStudyCourseItem(StudySignup signup);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除报名,只有未审核过的才可以删除
|
* 删除报名,只有未审核过的才可以删除
|
||||||
|
|||||||
@@ -97,30 +97,6 @@ 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);
|
||||||
// List<CourseContent> 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);
|
studyCourseDao.save(sc);
|
||||||
signup.setStudyId(sc.getId());
|
signup.setStudyId(sc.getId());
|
||||||
//发布到ES
|
//发布到ES
|
||||||
@@ -159,11 +135,38 @@ public class StudySignupServiceImpl implements IStudySignupService{
|
|||||||
//courseDao.updateMultiFieldById(signup.getCourseId(),UpdateBuilder.create("studys", "studys+1",FieldUpdateType.EXPRESSION));
|
//courseDao.updateMultiFieldById(signup.getCourseId(),UpdateBuilder.create("studys", "studys+1",FieldUpdateType.EXPRESSION));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public StudyCourseItem addStudyCourseItem(StudySignup signup) {
|
||||||
|
List<CourseContent> 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
|
@Override
|
||||||
public void addList(List<StudySignup> list) {
|
public void addList(List<StudySignup> list) {
|
||||||
//用于管理员添加报名
|
//用于管理员添加报名
|
||||||
for(StudySignup ss : list) {
|
for(StudySignup ss : list) {
|
||||||
addSignup(ss);
|
addSignup(ss);
|
||||||
|
addStudyCourseItem(ss);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user