diff --git a/web/src/main/java/cn/jlw/util/excel/ExcelSelector.java b/web/src/main/java/cn/jlw/util/excel/ExcelSelector.java index 237e99b7..99dd3aa9 100644 --- a/web/src/main/java/cn/jlw/util/excel/ExcelSelector.java +++ b/web/src/main/java/cn/jlw/util/excel/ExcelSelector.java @@ -1,5 +1,10 @@ package cn.jlw.util.excel; +import java.lang.annotation.*; + +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +@Inherited public @interface ExcelSelector { /** diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java index 8b66c3b9..cf07373b 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java @@ -1,7 +1,7 @@ package com.ibeetl.jlw.entity; import cn.jlw.util.excel.ExcelSelector; -import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; @@ -15,26 +15,26 @@ import java.math.BigDecimal; * 开课-题库管理-离线 * gen by Spring Boot2 Admin 2022-10-26 */ +@ExcelIgnoreUnannotated public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{ //ID @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) // @SeqID(name = ORACLE_CORE_SEQ_NAME) @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion") - @ExcelIgnore private Long teacherOpenCourseMergeResourcesQuestionId ; //开课ID - @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") @ExcelSelector(dictKeyValue = "teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") + @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") @ExcelProperty("关联开课") private Long teacherOpenCourseId ; //课程章节ID - @Dict(type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1") @ExcelSelector(dictKeyValue = "teacher_open_course_merge_course_info.course_info_name.course_info_status=1") + @Dict(type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1") @ExcelProperty("课程章节") private Long teacherOpenCourseMergeCourseInfoId ; @@ -42,6 +42,7 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{ //题型(1单选 2多选 3判断 4填空 5分析) @ExcelSelector(fixedSelector = {"1单选", "2多选", "3判断" }) @ExcelProperty("题型") + private Integer questionType ; //分值 @@ -94,17 +95,14 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{ //题目状态 (1上架, 2下架) @Dict(type="up_status") - @ExcelIgnore private Integer questionStatus ; //后台用户ID - @ExcelIgnore private Long userId ; //组织机构ID - @ExcelIgnore private Long orgId ;