gdxz/knowledge-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加了获取题库时，非必选题目的规则，增加了题目的状态判断

Browse Source
This commit is contained in:
admin
2024-11-08 14:36:44 +08:00
parent b26c58f9fb
commit 066b3fd7a2
2 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/dao/QuestionQaItem.go
+58 -23
View File
@@ -91,24 +91,6 @@ func (r *QuestionQaItemDao) GetQuestionQaItemPreloadList(maps interface{}) (m []
return m, nil
}
// GetQuestionQaItemPreloadListRand 获取列表-加载全部关联-随机
func (r *QuestionQaItemDao) GetQuestionQaItemPreloadListRand(maps interface{}) (m []*model.QuestionQaItem, err error) {
err = global.Db.Preload(clause.Associations).Where(maps).Order("rand()").Find(&m).Error
if err != nil {
return nil, err
}
return m, nil
}
// GetQuestionQaItemListRand 获取列表-随机
func (r *QuestionQaItemDao) GetQuestionQaItemListRand(maps interface{}, limit int) (m []*model.QuestionQaItem, err error) {
err = global.Db.Where(maps).Limit(limit).Order("rand()").Find(&m).Error
if err != nil {
return nil, err
}
return m, nil
}
// AddQuestionQaItem 新增
func (r *QuestionQaItemDao) AddQuestionQaItem(tx *gorm.DB, model *model.QuestionQaItem) (*model.QuestionQaItem, error) {
if err := tx.Create(model).Error; err != nil {
@@ -232,8 +214,8 @@ func (r *QuestionQaItemDao) GetQuestionQaItemPageSearch(req requests.GetQuestion
return m, totalRecords, nil
}
// GetQuestionQaItemWhereListRand 获取列表-随机
func (r *QuestionQaItemDao) GetQuestionQaItemWhereListRand(maps interface{}, limit int) (m []*model.QuestionQaItem, err error) {
// GetQuestionQaItemWhereList 获取列表
func (r *QuestionQaItemDao) GetQuestionQaItemWhereList(maps interface{}) (m []*model.QuestionQaItem, err error) {
query := global.Db.Model(&model.QuestionQaItem{})
query = query.Where(maps)
@@ -243,11 +225,64 @@ func (r *QuestionQaItemDao) GetQuestionQaItemWhereListRand(maps interface{}, lim
query = query.Preload("Question.QuestionOption")
subQuery := global.Db.Model(&model.Question{}).
Select("question_id").
Where("kb_question.question_id = kb_question_qa_item.question_id").
Where("question_status = ?", 1).
Where("is_delete = ?", 0)
Where("is_delete = ?", 0).
Select("1")
query = query.Where(gorm.Expr("question_id IN (?)", subQuery))
query = query.Where("EXISTS (?)", subQuery)
err = query.Find(&m).Error
if err != nil {
return nil, err
}
return m, nil
}
// GetQuestionQaItemWhereListRand 获取列表-随机
func (r *QuestionQaItemDao) GetQuestionQaItemWhereListRand(maps interface{}) (m []*model.QuestionQaItem, err error) {
query := global.Db.Model(&model.QuestionQaItem{})
query = query.Where(maps)
query = query.Preload("Question")
// 选项
query = query.Preload("Question.QuestionOption")
subQuery := global.Db.Model(&model.Question{}).
Where("kb_question.question_id = kb_question_qa_item.question_id").
Where("question_status = ?", 1).
Where("is_delete = ?", 0).
Select("1")
query = query.Where("EXISTS (?)", subQuery)
query = query.Order("rand()")
err = query.Find(&m).Error
if err != nil {
return nil, err
}
return m, nil
}
// GetQuestionQaItemWhereListRandLimit 获取列表-随机-限制数量
func (r *QuestionQaItemDao) GetQuestionQaItemWhereListRandLimit(maps interface{}, limit int) (m []*model.QuestionQaItem, err error) {
query := global.Db.Model(&model.QuestionQaItem{})
query = query.Where(maps)
query = query.Preload("Question")
// 选项
query = query.Preload("Question.QuestionOption")
subQuery := global.Db.Model(&model.Question{}).
Where("kb_question.question_id = kb_question_qa_item.question_id").
Where("question_status = ?", 1).
Where("is_delete = ?", 0).
Select("1")
query = query.Where("EXISTS (?)", subQuery)
query = query.Limit(limit).Order("rand()")