From 483c7a2389e6de161a9fdf305ca492bf7928d0c8 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Tue, 1 Nov 2022 23:39:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E5=B0=91=E6=8F=90=E9=97=AE=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=BE=85=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ibeetl/admin/core/service/CoreUserService.java | 3 ++- .../jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java | 4 ++-- .../ibeetl/jlw/web/query/TeacherOpenCourseChatLogQuery.java | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java index 03815e96..568894b4 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java @@ -41,7 +41,8 @@ public class CoreUserService { query.setPassword(passwordEncryptService.password(password)); query.setState(ENABLE.getValue()); CoreUser user =userDao.createLambdaQuery().andEq(CoreUser::getCode,userName). - andEq(CoreUser::getPassword, passwordEncryptService.password(password)).single(); + andEq(CoreUser::getPassword, passwordEncryptService.password(password)) + .andEq(CoreUser::getState, ENABLE.getValue()).single(); if(user==null) { throw new PlatformException("用户"+userName+"不存在或者密码错误"); } 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 828319b8..e001b897 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java @@ -26,12 +26,12 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{ private Long teacherOpenCourseId ; - //课程ID + //课程章节ID @Dict(type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1") private Long teacherOpenCourseMergeCourseInfoId ; - //题型(1单选 2多选 3判断) + //题型(1单选 2多选 3判断 4填空 5分析) private Integer questionType ; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseChatLogQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseChatLogQuery.java index d3d0b94c..3d8c8b82 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseChatLogQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseChatLogQuery.java @@ -49,6 +49,9 @@ public class TeacherOpenCourseChatLogQuery extends PageParam { private String keywords; @Query(name = "学生得分", display = false) private BigDecimal studentScore; +// @Query(name = "提问方式", display = false) +// private SendTypeEnum sendType; + @Query(name = "附件上传（仅支持图片，多个逗号隔开）", display = false) private String chatFiles; @Query(name = "状态 （1正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_status")