From 529de0728d69553fe8e99ca109ac12cd413bc01a Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 12 Nov 2024 10:51:31 +0800
Subject: [PATCH] 2

---
 api/controller/questionQa.go | 10 ++++++++++
 api/dto/QuestionQa.go        |  8 ++++++++
 api/dto/QuestionQaTimer.go   |  1 +
 api/service/QuestionQa.go    | 14 +++++++++-----
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/api/controller/questionQa.go b/api/controller/questionQa.go
index cd672c0..9b6cf1b 100644
--- a/api/controller/questionQa.go
+++ b/api/controller/questionQa.go
@@ -370,5 +370,15 @@ func (r *QuestionQa) GetQuestionQa(c *gin.Context) {
 		g = g.LoadQaQuestionQuantityContent(questionQa.TokenQuestionContent)
 	}
 
+	// 加载题目计时
+	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/dto/QuestionQa.go b/api/dto/QuestionQa.go
index 740d26e..10343bd 100644
--- a/api/dto/QuestionQa.go
+++ b/api/dto/QuestionQa.go
@@ -163,3 +163,11 @@ func (r *QuestionQaDto) LoadQaQuestionQuantityContent(s string) *QuestionQaDto {
 	}
 	return r
 }
+
+// LoadQuestionQaTimerDto 加载计时设置
+func (r *QuestionQaDto) LoadQuestionQaTimerDto(m []*model.QuestionQaTimer) *QuestionQaDto {
+	if len(m) > 0 {
+		r.QuestionQaTimer = GetQuestionQaTimerListDto(m)
+	}
+	return r
+}
diff --git a/api/dto/QuestionQaTimer.go b/api/dto/QuestionQaTimer.go
index b81227d..fd25fd5 100644
--- a/api/dto/QuestionQaTimer.go
+++ b/api/dto/QuestionQaTimer.go
@@ -5,6 +5,7 @@ import (
 	"knowledge/api/model"
 )
 
+// QuestionQaTimerDto 知识问答-计时设置
 type QuestionQaTimerDto struct {
 	TimerId      string          `json:"timer_id"`      // 主键id
 	QaId         string          `json:"qa_id"`         // 知识问答id
diff --git a/api/service/QuestionQa.go b/api/service/QuestionQa.go
index 91ce5fc..dedbdd3 100644
--- a/api/service/QuestionQa.go
+++ b/api/service/QuestionQa.go
@@ -333,7 +333,6 @@ func (r *QuestionQaService) PutQuestionQa(qaId int64, req requests.PutQuestionQa
 		return false, err
 	}
 
-	fmt.Println(1111)
 	// 题目数量
 	if qaQuantity != questionQa.QaQuantity {
 		if req.Action == 1 {
@@ -342,6 +341,15 @@ func (r *QuestionQaService) PutQuestionQa(qaId int64, req requests.PutQuestionQa
 		}
 
 		questionQaData["qa_quantity"] = req.QaQuantity
+
+		if req.QaType == 2 {
+			questionQaData["token_num"] = req.TokenNum
+		}
+
+		if req.QaType == 3 {
+			questionQaData["token_num"] = req.TokenNum
+			questionQaData["round_num"] = req.RoundNum
+		}
 	}
 
 	// 处理题库明细-需重新生成时才会检测明细
@@ -802,10 +810,6 @@ func (r *QuestionQaService) CheckPutQaQuestionQuantity(req requests.PutQuestionQ
 
 			quantity := content.Quantity * *req.TokenNum * *req.RoundNum
 
-			fmt.Println(utils.QuestionType(content.QuestionType))
-			fmt.Println(quantity)
-			fmt.Println(req.QuestionQaItem)
-			fmt.Println(itemQuantity)
 			if quantity > itemQuantity {
 				return qaQuantity, errors.New(utils.QuestionType(content.QuestionType) + "数量不足")
 			}