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,