|
|
@@ -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
|