Przeglądaj źródła

fix(培训考试): 学习记录、考试记录默认按照时间排序

liuyaqi 3 lat temu
rodzic
commit
db101d1515

+ 8 - 0
service/learning/exam_record.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"fmt"
 	"lims_adapter/dao/learning"
+	"lims_adapter/model"
 	"lims_adapter/model/learning"
 
 	"dashoo.cn/micro_libary/micro_srv"
@@ -69,6 +70,13 @@ func (s LearningExamRecordService) List(ctx context.Context, req *learning.Learn
 		}
 		m = m.Page(req.Page.Current, req.Page.Size)
 	}
+	if req.OrderBy == nil {
+		req.OrderBy = &model.OrderBy{}
+	}
+	if req.OrderBy.Value == "" {
+		req.OrderBy.Value = "a.CreatedAt"
+		req.OrderBy.Type = "desc"
+	}
 	if req.OrderBy != nil && req.OrderBy.Value != "" {
 		order := "asc"
 		if req.OrderBy.Type == "desc" {

+ 8 - 0
service/learning/learning_record.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"fmt"
 	"lims_adapter/dao/learning"
+	"lims_adapter/model"
 	"lims_adapter/model/learning"
 
 	"dashoo.cn/micro_libary/micro_srv"
@@ -69,6 +70,13 @@ func (s LearningLearningRecordService) List(ctx context.Context, req *learning.L
 		}
 		m = m.Page(req.Page.Current, req.Page.Size)
 	}
+	if req.OrderBy == nil {
+		req.OrderBy = &model.OrderBy{}
+	}
+	if req.OrderBy.Value == "" {
+		req.OrderBy.Value = "a.CreatedAt"
+		req.OrderBy.Type = "desc"
+	}
 	if req.OrderBy != nil && req.OrderBy.Value != "" {
 		order := "asc"
 		if req.OrderBy.Type == "desc" {