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

修改了分享数据题库3

Browse Source
This commit is contained in:
wucongxing8150 2024-11-08 15:44:46 +08:00
parent 7ee6713a57
commit d32a7e4f5a
1 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
api/service/QuestionQa.go
View File

@ -1094,35 +1094,21 @@ func (r *QuestionQaService) GetShareQuestionQaForTypeThree(questionQa *model.Que
for _, v2 := range tokenQuestionContents { for _, v2 := range tokenQuestionContents {
shareDtoForTwo := &dto.ShareDtoForTwo{} shareDtoForTwo := &dto.ShareDtoForTwo{}
// 题目数据 // 处理对应飞花令数据
var questions []*model.Question for _, item := range baseTokenItems {
if len(shareDtoForTwo.BaseTokenItem) < (v2.Quantity * *questionQa.RoundNum) {
// 必选数据 questionDto := dto.GetBaseTokenItemDto(item)
for _, v3 := range mustQuestions { shareDtoForTwo.BaseTokenItem = append(shareDtoForTwo.BaseTokenItem, questionDto)
// 判断此题目是否已被选中
if utils.IsInSlice(v3.QuestionId, isUseQuestionId) {
continue
}
// 类型相同，加入该组数据中
if v2.QuestionType == v3.Question.QuestionType {
// 当数量超出时，跳出
if len(questions) >= v2.Quantity {
continue
}
questions = append(questions, v3.Question)
// 标记已被使用
isUseQuestionId = append(isUseQuestionId, v3.QuestionId)
} }
} }
// 题目数据-剩余随机数量 // 飞花令数量
remainingQuantity := v2.Quantity - len(questions) for i3 := 0; i3 < *questionQa.TokenNum; i3++ {
if remainingQuantity > 0 { // 题目数据
// 非必选数据 var questions []*model.Question
for _, v3 := range notMustQuestions {
// 必选数据
for _, v3 := range mustQuestions {
// 判断此题目是否已被选中 // 判断此题目是否已被选中
if utils.IsInSlice(v3.QuestionId, isUseQuestionId) { if utils.IsInSlice(v3.QuestionId, isUseQuestionId) {
continue continue
@ -1141,36 +1127,53 @@ func (r *QuestionQaService) GetShareQuestionQaForTypeThree(questionQa *model.Que
isUseQuestionId = append(isUseQuestionId, v3.QuestionId) isUseQuestionId = append(isUseQuestionId, v3.QuestionId)
} }
} }
}
// 处理返回值 // 题目数据-剩余随机数量
var questionDtoList []*dto.QuestionDto remainingQuantity := v2.Quantity - len(questions)
if remainingQuantity > 0 {
// 非必选数据
for _, v3 := range notMustQuestions {
// 判断此题目是否已被选中
if utils.IsInSlice(v3.QuestionId, isUseQuestionId) {
continue
}
// 处理数据 // 类型相同，加入该组数据中
for _, v3 := range questions { if v2.QuestionType == v3.Question.QuestionType {
// 处理返回值 // 当数量超出时，跳出
questionDto := dto.GetShareQuestionDto(v3) if len(questions) >= v2.Quantity {
continue
}
// 加载选项 questions = append(questions, v3.Question)
questionDto.LoadQuestionOptionSimplify(v3.QuestionOption)
// 加载图片 // 标记已被使用
questionDto.LoadQuestionImage(v3.QuestionImage) isUseQuestionId = append(isUseQuestionId, v3.QuestionId)
}
// 加载答案 }
questionDto.LoadQuestionAnswer(v3)
questionDtoList = append(questionDtoList, questionDto)
}
shareDtoForTwo.Question = append(shareDtoForTwo.Question, questionDtoList)
// 处理对应飞花令数据
for _, item := range baseTokenItems {
if len(shareDtoForTwo.BaseTokenItem) < (v2.Quantity * *questionQa.RoundNum) {
questionDto := dto.GetBaseTokenItemDto(item)
shareDtoForTwo.BaseTokenItem = append(shareDtoForTwo.BaseTokenItem, questionDto)
} }
// 处理返回值
var questionDtoList []*dto.QuestionDto
// 处理数据
for _, v3 := range questions {
// 处理返回值
questionDto := dto.GetShareQuestionDto(v3)
// 加载选项
questionDto.LoadQuestionOptionSimplify(v3.QuestionOption)
// 加载图片
questionDto.LoadQuestionImage(v3.QuestionImage)
// 加载答案
questionDto.LoadQuestionAnswer(v3)
questionDtoList = append(questionDtoList, questionDto)
}
shareDtoForTwo.Question = append(shareDtoForTwo.Question, questionDtoList)
} }
// 填入对应类别 // 填入对应类别