diff --git a/doc/sql/mysql/2.tianze-pro-update.sql b/doc/sql/mysql/2.tianze-pro-update.sql index 2f9254bc..63ca8c9e 100644 --- a/doc/sql/mysql/2.tianze-pro-update.sql +++ b/doc/sql/mysql/2.tianze-pro-update.sql @@ -374,7 +374,7 @@ CREATE TABLE `general_question_setting` ( `general_question_setting_id` bigint(20) NOT NULL COMMENT '通用题目设置ID', `business_id` bigint(20) NOT NULL COMMENT '业务ID', `business_type` varchar(50) NOT NULL COMMENT '业务类型(枚举 QuestionBussinessTypeEnum)', - `general_question_setting_school_class_ids` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '班级ID集合(逗号隔开)', + `general_question_setting_school_class_ids` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '班级ID集合(逗号隔开)', `general_question_setting_do_count` int(11) DEFAULT NULL COMMENT '作答次数', `general_question_setting_question_no_order` int(11) DEFAULT NULL COMMENT '题目乱序(同一大题内)', `general_question_setting_option_no_order` int(11) DEFAULT NULL COMMENT '选项乱序(限单选、多选)', diff --git a/web/src/main/resources/sql/jlw/resourcesQuestion.md b/web/src/main/resources/sql/jlw/resourcesQuestion.md index fb9d7452..ffe08ee3 100644 --- a/web/src/main/resources/sql/jlw/resourcesQuestion.md +++ b/web/src/main/resources/sql/jlw/resourcesQuestion.md @@ -531,11 +531,11 @@ getGroupQuestionTypeCountAndSelectInfo AND t.question_status = 1 @ // 课程ID @if(!isEmpty(courseInfoId)){ - AND t.id = #courseInfoId# + AND t.course_info_id = #courseInfoId# @} @ // 开课题目配置ID @if(!isEmpty(questionSettingId)){ - AND ta.question_setting_id = #questionSettingId# + AND ta.general_question_setting_id = #questionSettingId# @} GROUP BY 1,3,4