浏览代码

no message

xingzai 2 年之前
父节点
当前提交
62d81f5a90
共有 2 个文件被更改,包括 9 次插入2 次删除
  1. 1 1
      models/page_history_record.go
  2. 8 1
      services/industrial_management.go

+ 1 - 1
models/page_history_record.go

@@ -63,7 +63,7 @@ func GetTimeLineRecordItem(userId, industrialManagementId int) (item *CygxPageHi
 
 func GetTimeLineRecordAllCount(userId int, date string) (items []*CygxPageHistoryRecord, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_page_history_record WHERE user_id=? AND router LIKE '%/api/report/industry/ArticleList?PageSize=10&CurrentIndex=1&CategoryId=99999&IndustrialManagementId=%' AND create_time > ? `
+	sql := `SELECT * FROM cygx_page_history_record WHERE user_id=? AND router LIKE '%/api/report/industry/ArticleList?PageSize=10&CurrentIndex=1&CategoryId=99999&IndustrialManagementId=%' AND create_time > ?  	ORDER BY  id  DESC  LIMIT 10 `
 	_, err = o.Raw(sql, userId, date).QueryRows(&items)
 	return
 }

+ 8 - 1
services/industrial_management.go

@@ -220,7 +220,11 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 	var industrialManagementIdstr string
 	industrialIdMap := make(map[string]time.Time)
 	for _, v := range recrodList {
-		industrialManagementIdstr = strings.TrimLeft(v.Router, utils.TIME_LINE_ROUTE)
+		//fmt.Println(v.Router)
+		sliceindustrial := strings.Split(v.Router, "=")
+		//industrialManagementIdstr = strings.TrimLeft(v.Router, utils.TIME_LINE_ROUTE)
+		industrialManagementIdstr = sliceindustrial[len(sliceindustrial)-1]
+		//fmt.Println(industrialManagementIdstr)
 		if createTime, ok := industrialIdMap[industrialManagementIdstr]; ok {
 			if createTime.Before(v.CreateTime) {
 				industrialIdMap[industrialManagementIdstr] = v.CreateTime
@@ -250,6 +254,9 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 			timeLineRedMap[industrialId] = true
 		}
 	}
+	//fmt.Println(industrialIdMap["90"])
+	//fmt.Println(timeLineRedMap[90])
+	//fmt.Println(mapIndustrialArticleHistory[90])
 	for k, v := range list {
 		list[k].UpdateTime = utils.TimeRemoveHms(mapUPdateTime[v.IndustrialManagementId])
 		if userId > 0 {