111
This commit is contained in:
parent
a8c6cc5672
commit
9203b3b6f1
@ -403,11 +403,6 @@ func (r *QuestionQa) GetQuestionQa(c *gin.Context) {
|
|||||||
// 加载题目计时
|
// 加载题目计时
|
||||||
questionQaTimerDao := dao.QuestionQaTimerDao{}
|
questionQaTimerDao := dao.QuestionQaTimerDao{}
|
||||||
questionQaTimers, err := questionQaTimerDao.GetQuestionQaTimerListByQaId(questionQa.QaId)
|
questionQaTimers, err := questionQaTimerDao.GetQuestionQaTimerListByQaId(questionQa.QaId)
|
||||||
if err != nil {
|
|
||||||
responses.FailWithMessage("题库存在错误", c)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
g = g.LoadQuestionQaTimerDto(questionQaTimers)
|
g = g.LoadQuestionQaTimerDto(questionQaTimers)
|
||||||
|
|
||||||
responses.OkWithData(g, c)
|
responses.OkWithData(g, c)
|
||||||
|
|||||||
@ -162,6 +162,11 @@ func (r *Share) GetQuestionQa(c *gin.Context) {
|
|||||||
|
|
||||||
g := dto.GetQuestionQaDto(questionQa)
|
g := dto.GetQuestionQaDto(questionQa)
|
||||||
|
|
||||||
|
// 加载题目计时
|
||||||
|
questionQaTimerDao := dao.QuestionQaTimerDao{}
|
||||||
|
questionQaTimers, err := questionQaTimerDao.GetQuestionQaTimerListByQaId(questionQa.QaId)
|
||||||
|
g = g.LoadQuestionQaTimerDto(questionQaTimers)
|
||||||
|
|
||||||
responses.OkWithData(g, c)
|
responses.OkWithData(g, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -14,14 +14,16 @@ type ShareAuthDto struct {
|
|||||||
|
|
||||||
// ShareDto 获取返回数据-常规模式
|
// ShareDto 获取返回数据-常规模式
|
||||||
type ShareDto struct {
|
type ShareDto struct {
|
||||||
Question []*QuestionDto `json:"question"` // 题库关联题目列表
|
Question []*QuestionDto `json:"question"` // 题库关联题目列表
|
||||||
BaseTokenItem []*BaseTokenItemDto `json:"base_token_item"` // 题库关联飞花令-列表
|
BaseTokenItem []*BaseTokenItemDto `json:"base_token_item"` // 题库关联飞花令-列表
|
||||||
|
QuestionQaTimerDto []*QuestionQaTimerDto `json:"question_qa_timer"` // 题库关联倒计时-列表
|
||||||
}
|
}
|
||||||
|
|
||||||
// ShareDtoForTwo 获取返回数据-固定套题模式
|
// ShareDtoForTwo 获取返回数据-固定套题模式
|
||||||
type ShareDtoForTwo struct {
|
type ShareDtoForTwo struct {
|
||||||
Question [][]*QuestionDto `json:"question"` // 题库关联题目列表
|
Question [][]*QuestionDto `json:"question"` // 题库关联题目列表
|
||||||
BaseTokenItem []*BaseTokenItemDto `json:"base_token_item"` // 题库关联飞花令-列表
|
BaseTokenItem []*BaseTokenItemDto `json:"base_token_item"` // 题库关联飞花令-列表
|
||||||
|
QuestionQaTimerDto []*QuestionQaTimerDto `json:"question_qa_timer"` // 题库关联倒计时-列表
|
||||||
}
|
}
|
||||||
|
|
||||||
// ShareDtoForThree 获取返回数据-多轮固定题型模式
|
// ShareDtoForThree 获取返回数据-多轮固定题型模式
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user