beetlsql3-dev
Mlxa0324 2 years ago
parent d3e1b77b17
commit 99c181e510

@ -167,6 +167,30 @@ public class CoreBaseService<T> extends CoreBaseAnnotationParser {
}
}
/**
*
*
* @param list
* @return
*/
public boolean upsertBatchByTemplate(List<T> list) {
if (list.size() > 0) {
return list.stream().map(this::upsertByTemplate).anyMatch(o -> o);
} else {
return false;
}
}
/**
*
*
* @param t
* @return
*/
public boolean upsertByTemplate(T t) {
return sqlManager.upsertByTemplate(t);
}
/**
* ID
*

@ -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

@ -204,6 +204,7 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
List<TeacherOpenCourseMergeSchoolClass> mergeSchoolClassList = teacherOpenCourseMergeSchoolClassDao.createLambdaQuery()
.andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseId, teacherOpenCourseMergeTeacher.getTeacherOpenCourseId())
.andEq(TeacherOpenCourseMergeSchoolClass::getSchoolClassId, student.getClassId())
.andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassStatus, 1)
.select();
Assert.notEmpty(mergeSchoolClassList, "未分配课程!");

@ -88,7 +88,8 @@ queryByCondition
@if(!isEmpty(userIdPlural)){
and find_in_set(t.user_id,#userIdPlural#)
@}
ORDER BY
CONVERT(regexp_replace ( t.teacher_open_course_question_setting_name, '[^0-9]+', '' ),unsigned) asc
queryByConditionQuery
===
@ -178,8 +179,8 @@ queryByConditionQuery
@if(!isEmpty(userIdPlural)){
and find_in_set(t.user_id,#userIdPlural#)
@}
ORDER BY
CONVERT(regexp_replace ( t.teacher_open_course_question_setting_name, '[^0-9]+', '' ),unsigned) asc
logicDeleteBySettingIds

Loading…
Cancel
Save