tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

排序

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent b82c98ca48
commit 11f1b43ffd
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java
Unescape Escape View File

@ -1129,7 +1129,7 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
case MOVE_LEFT: {
List<CourseInfo> result = courseInfoDao.createLambdaQuery()
.andEq(CourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType())
.andLess(CourseInfo::getOrderIndex, mergeCourseInfo.getOrderIndex())
.andLess(CourseInfo::getOrderIndex, defaultIfNull(mergeCourseInfo.getOrderIndex(), 50))
.andEq(CourseInfo::getCourseInfoStatus, 1)
.andNotEq(CourseInfo::getCourseInfoId, id)
.desc(CourseInfo::getOrderIndex)
@ -1158,7 +1158,7 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
case MOVE_RIGHT: {
List<CourseInfo> result = courseInfoDao.createLambdaQuery()
.andEq(CourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType())
.andGreat(CourseInfo::getOrderIndex, mergeCourseInfo.getOrderIndex())
.andGreat(CourseInfo::getOrderIndex, defaultIfNull(mergeCourseInfo.getOrderIndex(), 50))
.andEq(CourseInfo::getCourseInfoStatus, 1)
.andNotEq(CourseInfo::getCourseInfoId, id)
.asc(CourseInfo::getOrderIndex)

4
web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java
Unescape Escape View File

@ -347,7 +347,7 @@ public class ResourcesInfoService extends CoreBaseService<ResourcesInfo>{
case MOVE_LEFT: {
List<ResourcesInfo> result = resourcesInfoDao.createLambdaQuery()
.andEq(ResourcesInfo::getResourcesInfoId, mergeCourseInfo.getResourcesInfoId())
.andLess(ResourcesInfo::getOrderIndex, mergeCourseInfo.getOrderIndex())
.andLess(ResourcesInfo::getOrderIndex, defaultIfNull(mergeCourseInfo.getOrderIndex(), 50))
.desc(ResourcesInfo::getOrderIndex)
.limit(1, 2)
.select(ResourcesInfo::getOrderIndex);
@ -373,7 +373,7 @@ public class ResourcesInfoService extends CoreBaseService<ResourcesInfo>{
case MOVE_RIGHT: {
List<ResourcesInfo> result = resourcesInfoDao.createLambdaQuery()
.andGreat(ResourcesInfo::getOrderIndex, mergeCourseInfo.getOrderIndex())
.andGreat(ResourcesInfo::getOrderIndex, defaultIfNull(mergeCourseInfo.getOrderIndex(), 50))
.andEq(ResourcesInfo::getResourcesInfoId, mergeCourseInfo.getResourcesInfoId())
.asc(ResourcesInfo::getOrderIndex)
.limit(1, 2)

5
web/src/main/java/com/ibeetl/jlw/service/StudentClientLinkService.java
Unescape Escape View File

@ -29,6 +29,7 @@ import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
import static java.lang.Math.min;
@ -229,7 +230,7 @@ public class StudentClientLinkService extends CoreBaseService<StudentClientLink>
case MOVE_LEFT: {
List<StudentClientLink> result = studentClientLinkDao.createLambdaQuery()
.andEq(StudentClientLink::getStudentClientLinkType, studentClientLink.getStudentClientLinkType())
.andLess(StudentClientLink::getStudentClientLinkOrder, studentClientLink.getStudentClientLinkOrder())
.andLess(StudentClientLink::getStudentClientLinkOrder, defaultIfNull(studentClientLink.getStudentClientLinkOrder(), 50))
.andEq(StudentClientLink::getStudentClientLinkStatus, 1)
.andNotEq(StudentClientLink::getStudentClientLinkId, id)
.desc(StudentClientLink::getStudentClientLinkOrder)
@ -264,7 +265,7 @@ public class StudentClientLinkService extends CoreBaseService<StudentClientLink>
case MOVE_RIGHT: {
List<StudentClientLink> result = studentClientLinkDao.createLambdaQuery()
.andEq(StudentClientLink::getStudentClientLinkType, studentClientLink.getStudentClientLinkType())
.andGreat(StudentClientLink::getStudentClientLinkOrder, studentClientLink.getStudentClientLinkOrder())
.andGreat(StudentClientLink::getStudentClientLinkOrder, defaultIfNull(studentClientLink.getStudentClientLinkOrder(), 50))
.andEq(StudentClientLink::getStudentClientLinkStatus, 1)
.andNotEq(StudentClientLink::getStudentClientLinkId, id)
.asc(StudentClientLink::getStudentClientLinkOrder)

4
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
Unescape Escape View File

@ -1225,7 +1225,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
case MOVE_LEFT: {
List<TeacherOpenCourseMergeCourseInfo> result = teacherOpenCourseMergeCourseInfoDao.createLambdaQuery()
.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType())
.andLess(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder, mergeCourseInfo.getTeacherOpenCourseMergeCourseInfoOrder())
.andLess(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder, defaultIfNull(mergeCourseInfo.getTeacherOpenCourseMergeCourseInfoOrder(), 50))
.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoStatus, 1)
.andNotEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId, id)
.desc(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder)
@ -1254,7 +1254,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
case MOVE_RIGHT: {
List<TeacherOpenCourseMergeCourseInfo> result = teacherOpenCourseMergeCourseInfoDao.createLambdaQuery()
.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType())
.andGreat(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder, mergeCourseInfo.getTeacherOpenCourseMergeCourseInfoOrder())
.andGreat(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder, defaultIfNull(mergeCourseInfo.getTeacherOpenCourseMergeCourseInfoOrder(), 50))
.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoStatus, 1)
.andNotEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId, id)
.asc(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder)

4
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
Unescape Escape View File

@ -511,7 +511,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
.andEq(TeacherOpenCourseMergeResourcesInfo::getResourcesInfoStatus, 1)
.andNotEq(TeacherOpenCourseMergeResourcesInfo::getTeacherOpenCourseMergeResourcesInfoId, mergeCourseInfo.getTeacherOpenCourseMergeResourcesInfoId())
.andEq(TeacherOpenCourseMergeResourcesInfo::getTeacherOpenCourseMergeCourseInfoId, mergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId())
.andLess(TeacherOpenCourseMergeResourcesInfo::getOrderIndex, mergeCourseInfo.getOrderIndex())
.andLess(TeacherOpenCourseMergeResourcesInfo::getOrderIndex, defaultIfNull(mergeCourseInfo.getOrderIndex(), 50))
.andEq(TeacherOpenCourseMergeResourcesInfo::getResourcesInfoStatus, 1)
.desc(TeacherOpenCourseMergeResourcesInfo::getOrderIndex)
.limit(1, 2)
@ -538,7 +538,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
case MOVE_RIGHT: {
List<TeacherOpenCourseMergeResourcesInfo> result = teacherOpenCourseMergeResourcesInfoDao.createLambdaQuery()
.andGreat(TeacherOpenCourseMergeResourcesInfo::getOrderIndex, mergeCourseInfo.getOrderIndex())
.andGreat(TeacherOpenCourseMergeResourcesInfo::getOrderIndex, defaultIfNull(mergeCourseInfo.getOrderIndex(), 50))
.andEq(TeacherOpenCourseMergeResourcesInfo::getResourcesInfoStatus, 1)
.andNotEq(TeacherOpenCourseMergeResourcesInfo::getTeacherOpenCourseMergeResourcesInfoId, mergeCourseInfo.getTeacherOpenCourseMergeResourcesInfoId())
.andEq(TeacherOpenCourseMergeResourcesInfo::getTeacherOpenCourseMergeCourseInfoId, mergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId())

Write Preview
Loading…
Cancel
Save