|
|
|
@ -22,6 +22,7 @@ import javax.validation.constraints.NotNull;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 开课关联班级 Service
|
|
|
|
@ -77,6 +78,10 @@ public class TeacherOpenCourseMergeSchoolClassService extends CoreBaseService<Te
|
|
|
|
|
} catch (Exception e1) {}
|
|
|
|
|
}
|
|
|
|
|
ToolUtils.deleteNullList(teacherOpenCourseMergeSchoolClassList);
|
|
|
|
|
|
|
|
|
|
// 过滤掉已经添加的数据
|
|
|
|
|
teacherOpenCourseMergeSchoolClassList = teacherOpenCourseMergeSchoolClassList.stream().filter(item -> checkCount(item) == 0).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
if(null != teacherOpenCourseMergeSchoolClassList && teacherOpenCourseMergeSchoolClassList.size()>0){
|
|
|
|
|
for(int i=0;i<teacherOpenCourseMergeSchoolClassList.size();i++){
|
|
|
|
|
TeacherOpenCourseMergeSchoolClass teacherOpenCourseMergeSchoolClass = teacherOpenCourseMergeSchoolClassList.get(i);
|
|
|
|
@ -90,6 +95,20 @@ public class TeacherOpenCourseMergeSchoolClassService extends CoreBaseService<Te
|
|
|
|
|
return msg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 根据题目配置查询数量
|
|
|
|
|
* @param item
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private long checkCount(TeacherOpenCourseMergeSchoolClass item) {
|
|
|
|
|
Long schoolClassId = item.getSchoolClassId();
|
|
|
|
|
Long openCourseId = item.getTeacherOpenCourseId();
|
|
|
|
|
return sqlManager.lambdaQuery(TeacherOpenCourseMergeSchoolClass.class).andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseId, openCourseId)
|
|
|
|
|
.andEq(TeacherOpenCourseMergeSchoolClass::getSchoolClassId, schoolClassId)
|
|
|
|
|
.andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassStatus, 1)
|
|
|
|
|
.count();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 支持导入一个班的学生数据
|
|
|
|
|
* @param schoolClassQuery
|
|
|
|
|