|
@@ -174,8 +174,12 @@ func (l *DeskAnalysisReport) DeskReport() {
|
|
|
title = fmt.Sprintf("%d年%d月份%s市场分析简报", showTime.Year(), int(showTime.Month()), gconv.String(row["industry"]))
|
|
|
}
|
|
|
row["title"] = title
|
|
|
+ sTime := showTime.AddDate(0, 0, 7)
|
|
|
+ if sTime.Unix() > time.Now().Unix() {
|
|
|
+ sTime = time.Now()
|
|
|
+ }
|
|
|
dataArrMap = append(dataArrMap, map[string]interface{}{"title": title,
|
|
|
- "showTime": showTime.AddDate(0, 0, 7).Format("2006-01-02"),
|
|
|
+ "showTime": sTime.Format("2006-01-02"),
|
|
|
"url": fmt.Sprintf("/hybg/%s.html", gconv.String(row["id"]))})
|
|
|
}
|
|
|
return dataArrMap
|