From 4b2ab9adba94d2b2d5f5e960495eaf767436b5a4 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Tue, 20 Dec 2022 21:28:50 +0800 Subject: [PATCH] 1 --- .../jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java | 5 +++-- .../TeacherOpenCourseMergeResourcesQuestionController.java | 6 ++---- .../main/resources/sql/jlw/teacherOpenCourseQuestionLog.md | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) 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 ae15f476..ee4ff5c8 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java @@ -52,9 +52,10 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity { private Long teacherOpenCourseMergeCourseInfoId ; //题型(1单选 2多选 3判断 4填空 5分析) - @ExcelSelector(fixedSelector = {"单选"+ID_SEPARATOR+"1", "多选"+ID_SEPARATOR+"2", "判断"+ID_SEPARATOR+"3", "填空"+ID_SEPARATOR+"4", "分析"+ID_SEPARATOR+"5" }) - @ExcelProperty(value = "题型", index = 2) + @ExcelSelector(fixedSelector = {"单选"+ID_SEPARATOR+"1", "多选"+ID_SEPARATOR+"2", "判断"+ID_SEPARATOR+"3" }) +// @ExcelSelector(fixedSelector = {"单选"+ID_SEPARATOR+"1", "多选"+ID_SEPARATOR+"2", "判断"+ID_SEPARATOR+"3", "填空"+ID_SEPARATOR+"4", "分析"+ID_SEPARATOR+"5" }) + @ExcelProperty(value = "题型", index = 2) private Integer questionType ; //分值 diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java index 8df1c612..7920f1d0 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java @@ -509,10 +509,8 @@ public class TeacherOpenCourseMergeResourcesQuestionController extends BaseContr */ @SneakyThrows @PostMapping(API + "/importBatchTemplate.do") - public JsonResult importBatchTemplate(MultipartFile file) { + public JsonResult importBatchTemplate(MultipartFile file, @SCoreUser CoreUser coreUser) { - CoreUser user = getUser(); - Assert.notNull(user, "请登录后再操作"); Assert.isNull(getStudent(), "学生无法访问该接口"); // 输出 Excel @@ -526,7 +524,7 @@ public class TeacherOpenCourseMergeResourcesQuestionController extends BaseContr .map(TeacherOpenCourseMergeResourcesQuestionImport::pojo).collect(Collectors.toList()); // 只复制用户ID和组织ID - BeanUtil.beanPropertyCopyToList(user, options, MapUtil.of("id", "userId"), "userId", "orgId"); + BeanUtil.beanPropertyCopyToList(coreUser, options, MapUtil.of("id", "userId"), "userId", "orgId"); teacherOpenCourseMergeResourcesQuestionService.insertBatch(options); diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md index 6d8c4d0b..b90a704a 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md @@ -241,7 +241,7 @@ queryByConditionQuery and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) @} @if(!isEmpty(questionLogAddType)){ - and tc.teacher_open_course_question_setting_type =#questionLogAddType# + and t.question_log_add_type = #questionLogAddType# @} @if(!isEmpty(orgId)){ and t.org_id =#orgId#