班级管理

src/main/java/com/peanut/modules/common/entity/ClassCourse.java

@@ -12,7 +12,7 @@ public class ClassCourse {
     @TableId
     private Integer id;
 
-    private Integer classId;
+    private Integer modelId;
 
     private Integer courseId;
 

src/main/java/com/peanut/modules/common/entity/ClassEntity.java

@@ -1,5 +1,6 @@
 package com.peanut.modules.common.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -13,6 +14,8 @@ public class ClassEntity {
     @TableId
     private Integer id;
 
+    private Integer modelId;
+
     private String title;
 
     //小班状态 0待开班1进行中2完成
@@ -22,15 +25,18 @@ public class ClassEntity {
 
     private String content;
 
-    private Integer create_user;
+    private Integer createUserid;
 
     private Date createTime;
 
-    private Date start_time;
+    private Date startTime;
 
-    private Date end_time;
+    private Date endTime;
 
     @TableLogic
     private Integer delFlag;
 
+    @TableField(exist = false)
+    private Object createUser;
+
 }

src/main/java/com/peanut/modules/common/entity/ClassModel.java

@@ -0,0 +1,37 @@
+package com.peanut.modules.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@TableName("class_model")
+public class ClassModel {
+
+    @TableId
+    private Integer id;
+
+    private String title;
+
+    private Integer directorId;
+
+    private Integer ddirectorId;
+
+    private String type;//班类型 0小班 1联合班 2精英班
+
+    @TableLogic
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    private Object director;
+    @TableField(exist = false)
+    private Object ddirector;
+    @TableField(exist = false)
+    private String courseIds;
+    @TableField(exist = false)
+    private List<CourseEntity> courseList;
+}

src/main/java/com/peanut/modules/common/entity/CourseEntity.java

@@ -21,10 +21,6 @@ public class CourseEntity {
 
     private String title;
 
-    private Integer director;
-
-    private Integer ddirector;
-
     private Integer sort;
 
     private String image;