|
@@ -161,9 +161,9 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- //获取产业关联的最新的文章时间
|
|
|
|
|
|
+ //获取产业关联的的文章用户是否阅读
|
|
mapIndustrialArticleHistory, err := GetUserArticleHistoryIndustrialNewPublishDate(user, industrialIdArr, articleTypeIds, resource)
|
|
mapIndustrialArticleHistory, err := GetUserArticleHistoryIndustrialNewPublishDate(user, industrialIdArr, articleTypeIds, resource)
|
|
- fmt.Println(mapIndustrialArticleHistory)
|
|
|
|
|
|
+
|
|
if err != nil {
|
|
if err != nil {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -213,7 +213,7 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
|
|
//查询用户今天是否看过时间线
|
|
//查询用户今天是否看过时间线
|
|
//haveMorningMeeting := false
|
|
//haveMorningMeeting := false
|
|
//var morningMeetingTime string
|
|
//var morningMeetingTime string
|
|
- recrodList, err := models.GetTimeLineRecordAllCount(user.UserId, time.Now().Format(utils.FormatDate))
|
|
|
|
|
|
+ recrodList, err := models.GetTimeLineRecordAllCount(user.UserId, time.Now().Format(utils.FormatDateTime))
|
|
if err != nil {
|
|
if err != nil {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -253,9 +253,6 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
|
|
if userId > 0 {
|
|
if userId > 0 {
|
|
//如果文章没有阅读,而且,文章的发布时间晚于项目的上线时间,而且文章的发布时间晚于用户的注册时间,就进行标红处理
|
|
//如果文章没有阅读,而且,文章的发布时间晚于项目的上线时间,而且文章的发布时间晚于用户的注册时间,就进行标红处理
|
|
if mapIndustrialArticleHistory[v.IndustrialManagementId] || timeLineRedMap[v.IndustrialManagementId] {
|
|
if mapIndustrialArticleHistory[v.IndustrialManagementId] || timeLineRedMap[v.IndustrialManagementId] {
|
|
- //fmt.Println(mapHistroyindustrialId[v.IndustrialManagementId])
|
|
|
|
- //fmt.Println(timeLineRedMap[v.IndustrialManagementId])
|
|
|
|
- //if mapHistroyindustrialId[v.IndustrialManagementId] == 0 || timeLineRedMap[v.IndustrialManagementId] {
|
|
|
|
//if mapHistroyindustrialId[v.IndustrialManagementId] == 0 || timeLineRedMap[v.IndustrialManagementId] {
|
|
//if mapHistroyindustrialId[v.IndustrialManagementId] == 0 || timeLineRedMap[v.IndustrialManagementId] {
|
|
if user.CreatedTime.Before(utils.StrTimeToTime(mapUPdateTime[v.IndustrialManagementId])) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(mapUPdateTime[v.IndustrialManagementId])) {
|
|
if user.CreatedTime.Before(utils.StrTimeToTime(mapUPdateTime[v.IndustrialManagementId])) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(mapUPdateTime[v.IndustrialManagementId])) {
|
|
list[k].IsRed = true
|
|
list[k].IsRed = true
|