beetlsql3-dev
Mlxa0324 2 years ago
parent 607827efbd
commit cf1164487c

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AutoID; import org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -16,8 +16,8 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{
//ID //ID
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
// @SeqID(name = ORACLE_CORE_SEQ_NAME) // @SeqID(name = ORACLE_CORE_SEQ_NAME)
// @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo") @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo")
@AutoID
private Long teacherOpenCourseMergeResourcesInfoId ; private Long teacherOpenCourseMergeResourcesInfoId ;
//开课课程ID //开课课程ID

@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.ValidateConfig;
import org.beetl.sql.annotation.entity.AutoID; import org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -17,8 +17,8 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{
//ID //ID
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
// @SeqID(name = ORACLE_CORE_SEQ_NAME) // @SeqID(name = ORACLE_CORE_SEQ_NAME)
// @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion") @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion")
@AutoID
private Long teacherOpenCourseMergeResourcesQuestionId ; private Long teacherOpenCourseMergeResourcesQuestionId ;
//开课ID //开课ID

@ -459,6 +459,16 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
return teacherOpenCourseMergeCourseInfoDao.getExcelValues(teacherOpenCourseMergeCourseInfoQuery); return teacherOpenCourseMergeCourseInfoDao.getExcelValues(teacherOpenCourseMergeCourseInfoQuery);
} }
/**
* TeacherOpenCourseMergeCourseInfoIDparentId
* IDID
* @param copyToList
* @param parentId
*/
public void batchUpdateSomeMergeId(List<TeacherOpenCourseMergeCourseInfo> copyToList, Long parentId) {
}
/** /**
* - * -
@ -522,7 +532,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
// 开启并行处理 // 开启并行处理
courseInfoIds.stream().parallel().forEach(courseInfoId -> { courseInfoIds.stream().parallel().forEach(courseInfoId -> {
// 获取这个课程章节下的所有的子章节信息 // 获取这个课程章节下的所有的子章节信息
List<CourseInfo> chapterList = courseInfoService.getChapterList(Long.valueOf(courseInfoId)); List<CourseInfo> chapterList = courseInfoService.getChapterList(courseInfoId);
HashSet<CourseInfo> courseInfos = CollectionUtil.newHashSet(chapterList); HashSet<CourseInfo> courseInfos = CollectionUtil.newHashSet(chapterList);
// 如果课程章节没查到记录,则下面的资源也没必要执行,资源依赖课程章节 // 如果课程章节没查到记录,则下面的资源也没必要执行,资源依赖课程章节

Loading…
Cancel
Save