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 0f043203..6a228635 100644 --- a/web/src/main/java/cn/jlw/util/excel/ExcelSelector.java +++ b/web/src/main/java/cn/jlw/util/excel/ExcelSelector.java @@ -17,7 +17,7 @@ public @interface ExcelSelector { /** * 分隔符标记 */ - public String ID_SEPARATOR = "'___ID:'"; + String ID_SEPARATOR = "___ID:"; /** * 固定数据 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 6e0a25d8..fd83e355 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java @@ -34,7 +34,7 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{ private Long teacherOpenCourseMergeResourcesQuestionId ; //开课ID - @ExcelSelector(dictKeyValue = "teacher_open_course.concat(teacher_open_course_title, " + ID_SEPARATOR + ",teacher_open_course_id).teacher_open_course_status=1") + @ExcelSelector(dictKeyValue = "teacher_open_course.concat(teacher_open_course_title, '" + ID_SEPARATOR + "',teacher_open_course_id).teacher_open_course_status=1") @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") @ExcelProperty(value = "关联开课", index = 0) @@ -42,7 +42,7 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{ //课程章节ID @ExcelSelector( - dictKeyValue = "teacher_open_course_merge_course_info.concat(course_info_name, "+ ID_SEPARATOR +",teacher_open_course_merge_course_info_id).course_info_status=1,course_info_type!=1" + dictKeyValue = "teacher_open_course_merge_course_info.concat(course_info_name, '"+ ID_SEPARATOR +"',teacher_open_course_merge_course_info_id).course_info_status=1,course_info_type!=1" ) @Dict(type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1") @ExcelProperty(value = "课程章节", index = 1) @@ -50,7 +50,7 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{ private Long teacherOpenCourseMergeCourseInfoId ; //题型(1单选 2多选 3判断 4填空 5分析) - @ExcelSelector(fixedSelector = {"单选___ID:1", "多选___ID:2", "判断___ID:3" }) + @ExcelSelector(fixedSelector = {"单选"+ID_SEPARATOR+"1", "多选"+ID_SEPARATOR+"2", "判断"+ID_SEPARATOR+"3" }) @ExcelProperty(value = "题型", index = 2) private Integer questionType ;