diff --git a/web/src/main/java/com/ibeetl/jlw/enums/OpenCourseMergeJoinTypeEnum.java b/web/src/main/java/com/ibeetl/jlw/enums/OpenCourseMergeJoinTypeEnum.java index 9b7f970f..e212308e 100644 --- a/web/src/main/java/com/ibeetl/jlw/enums/OpenCourseMergeJoinTypeEnum.java +++ b/web/src/main/java/com/ibeetl/jlw/enums/OpenCourseMergeJoinTypeEnum.java @@ -1,31 +1,27 @@ package com.ibeetl.jlw.enums; import cn.jlw.util.EnumUtil; +import lombok.AllArgsConstructor; import lombok.Getter; import org.beetl.sql.annotation.entity.EnumMapping; /** * 学生加入课程的加入类型 */ + +@Getter +@AllArgsConstructor @EnumMapping("name") public enum OpenCourseMergeJoinTypeEnum { - // 进行中 + + student_join(0, "选择学生方式加入"), code_join(0, "授权码方式加入"), - // 已结束 class_join(1, "班级方式加入"); - @Getter private Integer code; - @Getter private String text; - - OpenCourseMergeJoinTypeEnum(Integer code, String text) { - this.text = text; - this.code = code; - } - public static OpenCourseMergeJoinTypeEnum getByCode(Integer code) { return EnumUtil.getByFieldWithValue(OpenCourseMergeJoinTypeEnum.class, "code", code); } diff --git a/web/src/main/java/com/ibeetl/jlw/enums/ResourcesQuestionSnapshotFromTypeEnum.java b/web/src/main/java/com/ibeetl/jlw/enums/ResourcesQuestionSnapshotFromTypeEnum.java index cd65aa0c..614e178a 100644 --- a/web/src/main/java/com/ibeetl/jlw/enums/ResourcesQuestionSnapshotFromTypeEnum.java +++ b/web/src/main/java/com/ibeetl/jlw/enums/ResourcesQuestionSnapshotFromTypeEnum.java @@ -1,8 +1,9 @@ package com.ibeetl.jlw.enums; +import lombok.AllArgsConstructor; import lombok.Getter; -import org.beetl.sql.annotation.entity.EnumValue; +import org.beetl.sql.annotation.entity.EnumMapping; /** *
@@ -15,6 +16,9 @@ import org.beetl.sql.annotation.entity.EnumValue; * @modified */ +@Getter +@AllArgsConstructor +@EnumMapping("name") public enum ResourcesQuestionSnapshotFromTypeEnum { HOMEWORK_QUESTION("作业-题目类型"), @@ -24,11 +28,6 @@ public enum ResourcesQuestionSnapshotFromTypeEnum { CHAPTER_EXERCISE("章节练习"); - @EnumValue - private String name = this.name(); - @Getter private String text; - ResourcesQuestionSnapshotFromTypeEnum(String text) { - this.text = text; - } + } diff --git a/web/src/main/java/com/ibeetl/jlw/enums/StartStatusEnum.java b/web/src/main/java/com/ibeetl/jlw/enums/StartStatusEnum.java index 6f210439..3bef7a10 100644 --- a/web/src/main/java/com/ibeetl/jlw/enums/StartStatusEnum.java +++ b/web/src/main/java/com/ibeetl/jlw/enums/StartStatusEnum.java @@ -1,13 +1,19 @@ package com.ibeetl.jlw.enums; import cn.jlw.util.EnumUtil; +import lombok.AllArgsConstructor; import lombok.Getter; +import org.beetl.sql.annotation.entity.EnumMapping; /** * 进行中 ING * 已结束 END * 未开始 READY */ + +@Getter +@AllArgsConstructor +@EnumMapping("text") public enum StartStatusEnum { // 进行中 ING(0, "进行中"), @@ -15,17 +21,14 @@ public enum StartStatusEnum { END(1, "已结束"), // 未开始 READY(-1, "未开始"); - @Getter + + private Integer code; + // 可以转换成中文 // @JsonValue + private String text; - @Getter - private Integer code; - StartStatusEnum(Integer code, String text) { - this.text = text; - this.code = code; - } public static StartStatusEnum getByCode(Integer code) { return EnumUtil.getByFieldWithValue(StartStatusEnum.class, "code", code);