1

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfoMyTree.java

@@ -8,6 +8,8 @@ import org.beetl.sql.annotation.entity.AutoID;
 import org.beetl.sql.annotation.entity.Table;
 import org.beetl.sql.fetch.annotation.Fetch;
 
+import java.math.BigDecimal;
+
 /**
  * 开课- 课程配置-离线
  * Tree结构数据
@@ -20,7 +22,7 @@ import org.beetl.sql.fetch.annotation.Fetch;
 @EqualsAndHashCode(callSuper=false)
 @FieldNameConstants
 @SuppressWarnings("ALL")
-public class TeacherOpenCourseMergeCourseInfoMyTree extends BaseEntity  implements Comparable<TeacherOpenCourseMergeCourseInfo> {
+public class TeacherOpenCourseMergeCourseInfoMyTree extends BaseEntity  implements Comparable<TeacherOpenCourseMergeCourseInfoMyTree> {
 
     //ID
     @AutoID
@@ -100,37 +102,11 @@ public class TeacherOpenCourseMergeCourseInfoMyTree extends BaseEntity  implemen
 
     private Long userId ;
 
-////    @FetchSql("select * from teacher_open_course_merge_course_info t " +
-////            "where t.course_info_parent_id = #teacherOpenCourseMergeCourseInfoId# ")
-//    @UpdateIgnore
-//    @InsertIgnore
-//    private List<TeacherOpenCourseMergeCourseInfoMyTree> children;
-//
-////    @FetchSql("select count(1) > 0 from teacher_open_course_merge_course_info t " +
-////            "where t.course_info_parent_id = #teacherOpenCourseMergeCourseInfoId# ")
-//    @UpdateIgnore
-//    @InsertIgnore
-//    private Boolean hasChildren;
-
-//    @UpdateIgnore
-//    @InsertIgnore
-//    @FetchSql("SELECT * FROM " +
-//            "teacher_open_course_merge_resources_info t " +
-//            "WHERE 1 = 1 " +
-//            "AND teacher_open_course_id = #teacherOpenCourseId# " +
-//            "and t.teacher_open_course_merge_course_info_id = #teacherOpenCourseMergeCourseInfoId# ")
-//    private List<TeacherOpenCourseMergeResourcesInfo> resourcesInfo;
+    //排序值
+    private BigDecimal teacherOpenCourseMergeCourseInfoOrder;
 
     @Override
-    public int compareTo(TeacherOpenCourseMergeCourseInfo o) {
-//        String o1Str = ReUtil.get("\\d+", o.getCourseInfoName(), 0);
-//            String o2Str = ReUtil.get("\\d+", this.getCourseInfoName(), 0);
-//
-//            int o1num = NumberUtil.isNumber(o1Str) ? Integer.valueOf(o1Str) : -1;
-//            int o2num = NumberUtil.isNumber(o2Str) ? Integer.valueOf(o2Str) : -1;
-//            return o1num - o2num;
-        return this.getTeacherOpenCourseMergeCourseInfoId().compareTo(o.getTeacherOpenCourseMergeCourseInfoId());
+    public int compareTo(TeacherOpenCourseMergeCourseInfoMyTree o) {
+        return this.getTeacherOpenCourseMergeCourseInfoOrder().compareTo(o.getTeacherOpenCourseMergeCourseInfoOrder());
     }
-
-
 }

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java

@@ -938,7 +938,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         defaultConfig.setIdKey(TeacherOpenCourseMergeCourseInfoMyTree.Fields.teacherOpenCourseMergeCourseInfoId);
         defaultConfig.setParentIdKey(TeacherOpenCourseMergeCourseInfoMyTree.Fields.courseInfoParentId);
         defaultConfig.setNameKey(TeacherOpenCourseMergeCourseInfoMyTree.Fields.courseInfoName);
-        defaultConfig.setWeightKey(TeacherOpenCourseMergeCourseInfoMyTree.Fields.teacherOpenCourseMergeCourseInfoId);
+        defaultConfig.setWeightKey(TeacherOpenCourseMergeCourseInfoMyTree.Fields.teacherOpenCourseMergeCourseInfoOrder);
 
         //3.转为树结构,其中rootId参数代表根节点的父级id值
         List<Tree<String>> build = TreeUtil.build(courseInfoList, "0", defaultConfig, ((courseInfo, treeNode) -> {
@@ -965,9 +965,11 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
             treeNode.setId(courseInfoId.toString());
             treeNode.setParentId(courseInfo.getCourseInfoParentId().toString());
             treeNode.setName(courseInfo.getCourseInfoName());
+            treeNode.setWeight(courseInfo.getTeacherOpenCourseMergeCourseInfoOrder());
             treeNode.putExtra("courseInfoType", courseInfo.getCourseInfoType());
             treeNode.putExtra("courseInfoContent", courseInfo.getCourseInfoContent());
             treeNode.putExtra("resourcesInfo", filteredResourcesInfoList);
+            treeNode.putExtra("orderIndex", courseInfo.getTeacherOpenCourseMergeCourseInfoOrder());
         }));
 
         if (build == null) { return null; }
@@ -1225,6 +1227,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
             case MOVE_LEFT: {
                 List<TeacherOpenCourseMergeCourseInfo> result = teacherOpenCourseMergeCourseInfoDao.createLambdaQuery()
                         .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType())
+                        .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoParentId, mergeCourseInfo.getCourseInfoParentId())
                         .andLess(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder, defaultIfNull(mergeCourseInfo.getTeacherOpenCourseMergeCourseInfoOrder(), 50))
                         .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoStatus, 1)
                         .andNotEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId, id)
@@ -1254,6 +1257,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
             case MOVE_RIGHT: {
                 List<TeacherOpenCourseMergeCourseInfo> result = teacherOpenCourseMergeCourseInfoDao.createLambdaQuery()
                         .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType())
+                        .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoParentId, mergeCourseInfo.getCourseInfoParentId())
                         .andGreat(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder, defaultIfNull(mergeCourseInfo.getTeacherOpenCourseMergeCourseInfoOrder(), 50))
                         .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoStatus, 1)
                         .andNotEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId, id)

web/src/main/resources/sql/jlw/teacherOpenCourseMergeCourseInfo.md

@@ -923,7 +923,8 @@ getByOpenCourseId
   resources_competition_ids,
   resources_training_ids,
   org_id,
-  user_id
+  user_id,
+  teacher_open_course_merge_course_info_order
   from teacher_open_course_merge_course_info t
   where 1 = 1
   and t.teacher_open_course_id = #teacherOpenCourseId#