处理分享2

2024-09-29 14:52:42 +08:00
parent 077b94ff99
commit 6431aa890b
7 changed files with 127 additions and 58 deletions
@@ -59,7 +59,13 @@ func (r *Share) GetShare(c *gin.Context) {
 		return
 	}

-	g := &dto.ShareDto{}
+	//g := dto.ShareDto{}
+
+	g := dto.ShareDto{
+		QuestionQa:    &dto.QuestionQaDto{},
+		Question:      []*dto.QuestionDto{},
+		BaseTokenItem: []*dto.BaseTokenItemDto{},
+	}

 	// 加载题库数据
 	g.QuestionQa = dto.GetQuestionQaDto(questionQa)
@@ -68,17 +74,32 @@ func (r *Share) GetShare(c *gin.Context) {
 	maps = make(map[string]interface{})
 	maps["qa_id"] = questionQa.QaId
 	maps["is_must_select"] = 1
-	questionQaItems, err := questionQaItemDao.GetQuestionQaItemrPreloadList(maps)
+	questionQaItems, err := questionQaItemDao.GetQuestionQaItemPreloadList(maps)
 	if err == nil && len(questionQaItems) > 0 {
-		for i, item := range questionQaItems {
+		for _, item := range questionQaItems {
+			questionOptionDao := dao.QuestionOptionDao{}
+			maps = make(map[string]interface{})
+			maps["question_id"] = item.QuestionId
+			questionOption, err := questionOptionDao.GetQuestionOptionList(maps)
+			if err != nil {
+				responses.FailWithMessage("内部错误", c)
+				return
+			}
+
 			// 处理返回值
 			questionDto := dto.GetShareQuestionDto(item.Question)

 			// 加载选项
-			questionDto.LoadQuestionOption(item.Question.QuestionOption)
+			questionDto.LoadQuestionOption(questionOption)
+
+			// 加载图片
+			questionDto.LoadQuestionImage(item.Question.QuestionImage)
+
+			// 加载答案
+			questionDto.LoadQuestionAnswer(item.Question.QuestionAnswer)

 			// 将转换后的结构体添加到新切片中
-			g.Question[i] = questionDto
+			g.Question = append(g.Question, questionDto)
 		}
 	}

@@ -92,11 +113,26 @@ func (r *Share) GetShare(c *gin.Context) {
 		questionQaItems, err = questionQaItemDao.GetQuestionQaItemWhereListRand(maps, remainingQuantity)
 		if err == nil && len(questionQaItems) > 0 {
 			for _, item := range questionQaItems {
+				questionOptionDao := dao.QuestionOptionDao{}
+				maps = make(map[string]interface{})
+				maps["question_id"] = item.QuestionId
+				questionOption, err := questionOptionDao.GetQuestionOptionList(maps)
+				if err != nil {
+					responses.FailWithMessage("内部错误", c)
+					return
+				}
+
 				// 处理返回值
 				questionDto := dto.GetShareQuestionDto(item.Question)

 				// 加载选项
-				questionDto.LoadQuestionOption(item.Question.QuestionOption)
+				questionDto.LoadQuestionOption(questionOption)
+
+				// 加载图片
+				questionDto.LoadQuestionImage(item.Question.QuestionImage)
+
+				// 加载答案
+				questionDto.LoadQuestionAnswer(item.Question.QuestionAnswer)

 				// 将转换后的结构体添加到新切片中
 				g.Question = append(g.Question, questionDto)