Browse Source

fix: 阅读记录筛选

hsun 2 tuần trước cách đây
mục cha
commit
dd656a0de0
3 tập tin đã thay đổi với 12 bổ sung6 xóa
  1. 1 1
      controllers/report.go
  2. 5 5
      models/classify.go
  3. 6 0
      models/user_read_record.go

+ 1 - 1
controllers/report.go

@@ -116,7 +116,7 @@ func (this *ReportController) ReadRecord() {
 			id, _ := strconv.Atoi(v)
 			ids = append(ids, id)
 		}
-		if len(ids) > 0 {
+		if len(ids) == 0 {
 			page := paging.GetPaging(params.CurrentIndex, params.PageSize, 0)
 			resp.Paging = page
 			resp.List = respList

+ 5 - 5
models/classify.go

@@ -37,11 +37,11 @@ type ClassifyCols struct {
 
 func (m *Classify) Cols() ClassifyCols {
 	return ClassifyCols{
-		PrimaryId:    "company_id",
-		ClassifyName: "company_name",
-		Sort:         "credit_code",
-		ParentId:     "province_id",
-		Enabled:      "province",
+		PrimaryId:    "id",
+		ClassifyName: "classify_name",
+		Sort:         "sort",
+		ParentId:     "parent_id",
+		Enabled:      "enabled",
 		CreateTime:   "create_time",
 		ModifyTime:   "modify_time",
 	}

+ 6 - 0
models/user_read_record.go

@@ -107,8 +107,11 @@ type UserReadRecordItem struct {
 	UserId             int    `description:"用户ID"`
 	ReportId           int    `description:"报告ID"`
 	ReportTitle        string `description:"报告标题"`
+	ClassifyIdFirst    int    `description:"一级分类ID"`
 	ClassifyNameFirst  string `description:"一级分类名称"`
+	ClassifyIdSecond   int    `description:"二级分类ID"`
 	ClassifyNameSecond string `description:"二级分类名称"`
+	ClassifyIdThird    int    `description:"三级分类ID"`
 	ClassifyNameThird  string `description:"三级分类名称"`
 	ReadDuration       string `description:"阅读时长"`
 	ReportSource       int    `description:"报告来源:1-研报中心;2-文档管理库"`
@@ -120,8 +123,11 @@ func (m *UserReadRecord) Format2Item() (item *UserReadRecordItem) {
 	item.UserId = m.UserId
 	item.ReportId = m.ReportId
 	item.ReportTitle = m.ReportTitle
+	item.ClassifyIdFirst = m.ClassifyIdFirst
 	item.ClassifyNameFirst = m.ClassifyNameFirst
+	item.ClassifyIdSecond = m.ClassifyIdSecond
 	item.ClassifyNameSecond = m.ClassifyNameSecond
+	item.ClassifyIdThird = m.ClassifyIdThird
 	item.ClassifyNameThird = m.ClassifyNameThird
 	if m.StartTimestamp > 0 && m.EndTimestamp > 0 {
 		item.ReadDuration = utils.SecondsToHMS(int64(m.EndTimestamp - m.StartTimestamp))