Przeglądaj źródła

fix(培训考试): 考试记录添加试卷名称字段

liuyaqi 3 lat temu
rodzic
commit
478054bd75

+ 3 - 2
model/learning/learning_exam_record.go

@@ -24,8 +24,9 @@ type LearningExamRecordListReq struct {
 
 type LearningExamRecordGetRsp struct {
 	LearningExamRecord
-	UserName  string `json:"userName"`  // 用户名称
-	SkillName string `json:"skillName"` // 技能名称
+	UserName      string `json:"userName"`      // 用户名称
+	SkillName     string `json:"skillName"`     // 技能名称
+	TestpaperName string `json:"testpaperName"` // 试卷名称
 }
 
 type LearningExamRecordAddReq struct {

+ 7 - 2
service/learning/exam_record.go

@@ -41,7 +41,8 @@ func (s LearningExamRecordService) List(ctx context.Context, req *learning.Learn
 	m := s.Dao.DB.
 		Table("learning_exam_record a").
 		LeftJoin("learning_skill b", "a.SkillId=b.Id").
-		LeftJoin("base_user c", "a.UserId=c.Id")
+		LeftJoin("base_user c", "a.UserId=c.Id").
+		LeftJoin("learning_testpaper d", "a.TestpaperId=d.Id")
 	if req.UserId != 0 {
 		m = m.Where("a.UserId = ?", req.UserId)
 	}
@@ -77,7 +78,11 @@ func (s LearningExamRecordService) List(ctx context.Context, req *learning.Learn
 	}
 
 	records := []*learning.LearningExamRecordGetRsp{}
-	err = m.Fields("a.*", "b.Name as SkillName", "c.Realname as UserName").
+	err = m.Fields(
+		"a.*",
+		"b.Name as SkillName",
+		"c.Realname as UserName",
+		"d.Name as TestpaperName").
 		Structs(&records)
 	if err != nil && err != sql.ErrNoRows {
 		return 0, nil, err