From 9203b3b6f1c8ef4201384a43b3c46cc1931abf69 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 12 Nov 2024 15:04:37 +0800
Subject: [PATCH] 111

---
 api/controller/questionQa.go |  5 -----
 api/controller/share.go      |  5 +++++
 api/dto/Share.go             | 10 ++++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/api/controller/questionQa.go b/api/controller/questionQa.go
index a81635d..4d51f6c 100644
--- a/api/controller/questionQa.go
+++ b/api/controller/questionQa.go
@@ -403,11 +403,6 @@ func (r *QuestionQa) GetQuestionQa(c *gin.Context) {
 	// 加载题目计时
 	questionQaTimerDao := dao.QuestionQaTimerDao{}
 	questionQaTimers, err := questionQaTimerDao.GetQuestionQaTimerListByQaId(questionQa.QaId)
-	if err != nil {
-		responses.FailWithMessage("题库存在错误", c)
-		return
-	}
-
 	g = g.LoadQuestionQaTimerDto(questionQaTimers)
 
 	responses.OkWithData(g, c)
diff --git a/api/controller/share.go b/api/controller/share.go
index cd6e4e0..4b49570 100644
--- a/api/controller/share.go
+++ b/api/controller/share.go
@@ -162,6 +162,11 @@ func (r *Share) GetQuestionQa(c *gin.Context) {
 
 	g := dto.GetQuestionQaDto(questionQa)
 
+	// 加载题目计时
+	questionQaTimerDao := dao.QuestionQaTimerDao{}
+	questionQaTimers, err := questionQaTimerDao.GetQuestionQaTimerListByQaId(questionQa.QaId)
+	g = g.LoadQuestionQaTimerDto(questionQaTimers)
+
 	responses.OkWithData(g, c)
 }
 
diff --git a/api/dto/Share.go b/api/dto/Share.go
index 6f20023..4f3add8 100644
--- a/api/dto/Share.go
+++ b/api/dto/Share.go
@@ -14,14 +14,16 @@ type ShareAuthDto struct {
 
 // ShareDto 获取返回数据-常规模式
 type ShareDto struct {
-	Question      []*QuestionDto      `json:"question"`        // 题库关联题目列表
-	BaseTokenItem []*BaseTokenItemDto `json:"base_token_item"` // 题库关联飞花令-列表
+	Question           []*QuestionDto        `json:"question"`          // 题库关联题目列表
+	BaseTokenItem      []*BaseTokenItemDto   `json:"base_token_item"`   // 题库关联飞花令-列表
+	QuestionQaTimerDto []*QuestionQaTimerDto `json:"question_qa_timer"` // 题库关联倒计时-列表
 }
 
 // ShareDtoForTwo 获取返回数据-固定套题模式
 type ShareDtoForTwo struct {
-	Question      [][]*QuestionDto    `json:"question"`        // 题库关联题目列表
-	BaseTokenItem []*BaseTokenItemDto `json:"base_token_item"` // 题库关联飞花令-列表
+	Question           [][]*QuestionDto      `json:"question"`          // 题库关联题目列表
+	BaseTokenItem      []*BaseTokenItemDto   `json:"base_token_item"`   // 题库关联飞花令-列表
+	QuestionQaTimerDto []*QuestionQaTimerDto `json:"question_qa_timer"` // 题库关联倒计时-列表
 }
 
 // ShareDtoForThree 获取返回数据-多轮固定题型模式