考证辅导

beetlsql3-dev
Mlxa0324 2 years ago
parent 3c56ea1603
commit 29c2228af2

@ -374,6 +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',
`source_course_info_ids` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '课程来源IDs',
`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 '题目乱序(同一大题内)',

@ -49,6 +49,9 @@ public class GeneralQuestionSetting extends BaseEntity{
@DictEnum
private QuestionBusinessTypeEnum businessType ;
// 用于指定课程中拉取题目。暂时查询中不会用到
private String sourceCourseInfoIds;
//班级ID集合逗号隔开

@ -72,7 +72,7 @@ public class QuestionSettingDTO {
/**
*
*/
private String courseInfoIdPlural;
private String sourceCourseInfoIds;
}

@ -579,7 +579,7 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
final String sourceCourseInfoIds = settingQuery.getSourceCourseInfoIds();
// 批量添加课程ID
settingDTOList.forEach(item -> item.setCourseInfoIdPlural(sourceCourseInfoIds));
settingDTOList.forEach(item -> item.setSourceCourseInfoIds(sourceCourseInfoIds));
// 如果指定的题目IDs不为空的话则需要对这些题目进行题目类型分组。
if(ObjectUtil.isNotEmpty(resourcesQuestionIdPlural)) {

@ -41,6 +41,8 @@ public class GeneralQuestionSettingQuery extends PageParam {
private Long businessId;
@Query(name = "业务类型", display = false)
private QuestionBusinessTypeEnum businessType;
@Query(name = "用于指定课程中拉取题目。暂时查询中不会用到", display = false)
private String sourceCourseInfoIds;
@Query(name = "班级ID集合逗号隔开", display = false)
private String generalQuestionSettingSchoolClassIds;
@Query(name = "作答次数", display = false)
@ -90,11 +92,6 @@ public class GeneralQuestionSettingQuery extends PageParam {
*/
private String resourcesQuestionIdPlural;
/**
*
*/
private String sourceCourseInfoIds;
private String generalQuestionSettingIdPlural;
private String businessIdPlural;
private String generalQuestionSettingStatusPlural;
@ -110,6 +107,7 @@ public class GeneralQuestionSettingQuery extends PageParam {
pojo.setGeneralQuestionSettingId(this.getGeneralQuestionSettingId());
pojo.setBusinessId(this.getBusinessId());
pojo.setBusinessType(this.getBusinessType());
pojo.setSourceCourseInfoIds(this.getSourceCourseInfoIds());
pojo.setGeneralQuestionSettingSchoolClassIds(this.getGeneralQuestionSettingSchoolClassIds());
pojo.setGeneralQuestionSettingName(this.getGeneralQuestionSettingName());
pojo.setGeneralQuestionStartTime(this.getGeneralQuestionStartTime());

@ -25,6 +25,12 @@ queryByCondition
@if(!isEmpty(businessType)){
and t.business_type =#businessType#
@}
@if(!isEmpty(sourceCourseInfoIds)){
and t.source_course_info_ids =#sourceCourseInfoIds#
@}
@if(!isEmpty(sourceCourseInfoIds)){
and t.source_course_info_ids =#sourceCourseInfoIds#
@}
@if(!isEmpty(generalQuestionSettingSchoolClassIds)){
and t.general_question_setting_school_class_ids =#generalQuestionSettingSchoolClassIds#
@}
@ -115,6 +121,9 @@ queryByConditionQuery
@if(!isEmpty(businessType)){
and t.business_type =#businessType#
@}
@if(!isEmpty(sourceCourseInfoIds)){
and t.source_course_info_ids =#sourceCourseInfoIds#
@}
@if(!isEmpty(generalQuestionSettingSchoolClassIds)){
and t.general_question_setting_school_class_ids =#generalQuestionSettingSchoolClassIds#
@}
@ -365,6 +374,9 @@ getGeneralQuestionSettingValues
@if(!isEmpty(businessType)){
and t.business_type =#businessType#
@}
@if(!isEmpty(sourceCourseInfoIds)){
and t.source_course_info_ids =#sourceCourseInfoIds#
@}
@if(!isEmpty(generalQuestionSettingSchoolClassIds)){
and t.general_question_setting_school_class_ids =#generalQuestionSettingSchoolClassIds#
@}
@ -443,6 +455,9 @@ getValuesByQuery
@if(!isEmpty(businessType)){
and t.business_type =#businessType#
@}
@if(!isEmpty(sourceCourseInfoIds)){
and t.source_course_info_ids =#sourceCourseInfoIds#
@}
@if(!isEmpty(generalQuestionSettingSchoolClassIds)){
and t.general_question_setting_school_class_ids =#generalQuestionSettingSchoolClassIds#
@}
@ -531,6 +546,9 @@ getValuesByQueryNotWithPermission
@if(!isEmpty(businessType)){
and t.business_type =#businessType#
@}
@if(!isEmpty(sourceCourseInfoIds)){
and t.source_course_info_ids =#sourceCourseInfoIds#
@}
@if(!isEmpty(generalQuestionSettingSchoolClassIds)){
and t.general_question_setting_school_class_ids =#generalQuestionSettingSchoolClassIds#
@}
@ -640,6 +658,9 @@ getExcelValues
@if(!isEmpty(businessType)){
and t.business_type =#businessType#
@}
@if(!isEmpty(sourceCourseInfoIds)){
and t.source_course_info_ids =#sourceCourseInfoIds#
@}
@if(!isEmpty(generalQuestionSettingSchoolClassIds)){
and t.general_question_setting_school_class_ids =#generalQuestionSettingSchoolClassIds#
@}
@ -741,6 +762,9 @@ getExcelValues
@if(!isEmpty(businessType)){
and t.business_type =#businessType#
@}
@if(!isEmpty(sourceCourseInfoIds)){
and t.source_course_info_ids =#sourceCourseInfoIds#
@}
@if(!isEmpty(generalQuestionSettingSchoolClassIds)){
and t.general_question_setting_school_class_ids =#generalQuestionSettingSchoolClassIds#
@}

@ -785,8 +785,8 @@ getQuestionBySettingOptionDTO
where 1=1
and t.question_status = 1
@// 课程IDs
@if(!isEmpty(courseInfoIdPlural)) {
and ta.course_info_full_id regexp #sputil.joinEx(@java.util.Arrays.asList(strUtil.splitToArray(courseInfoIdPlural, ',')), '|', '_', '_')#
@if(!isEmpty(sourceCourseInfoIds)) {
and ta.course_info_full_id regexp #sputil.joinEx(@java.util.Arrays.asList(strUtil.splitToArray(sourceCourseInfoIds, ',')), '|', '_', '_')#
@}
@// 题目ID优先级高
@if(!isEmpty(resourcesQuestionIdPlural)) {

Loading…
Cancel
Save