周度度 第几周标题处理

controllers/report.go

@@ -82,12 +82,30 @@ func (this *ReportController) IndustryList() {
 		br.Ret = 408
 		return
 	}
+
+	//list2, err := models.GetTacticsListAll2()
+	//
+	//for _, v := range list2 {
+	//	var titleNew string
+	//	//titleNew = v.Title
+	//	// 7资金流向 、11大类资产 、51每日复盘 、80医药周报
+	//	if v.CategoryId == 11 && v.UpdateFrequency == "weekly" {
+	//		titleNew = v.Title + utils.WeekByDate(v.PublishDate)
+	//		fmt.Println(v.PublishDate)
+	//		fmt.Println(titleNew)
+	//		fmt.Println("————————————————")
+	//	}
+	//}
+	//
+	//straa := utils.WeekByDate(utils.StrTimeToTime("2021-05-16 23:00:00"))
+	//fmt.Println(straa)
+
 	uid := user.UserId
 	var orderSrt string
 	ChartPermissionId, _ := this.GetInt("ChartPermissionId")
 	orderColumn := this.GetString("OrderColumn")
 
-	if orderColumn == " " {
+	if orderColumn == "" {
 		orderColumn = "NewTime"
 	}
 	if ChartPermissionId < 1 {
@@ -146,6 +164,7 @@ func (this *ReportController) IndustryList() {
 			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 			return
 		}
+		fmt.Println(newArtinfo.PublishDate)
 		list[k].UpdateTime = utils.TimeRemoveHms(newArtinfo.PublishDate)
 		recordCount, err := models.GetUserToArticleCount(uid, newArtinfo.ArticleId)
 		if err != nil && err.Error() != utils.ErrNoRow() {

utils/common.go

@@ -566,13 +566,18 @@ func TimeRemoveHms(strTime string) string {
 	year := resultTime.Year()
 	month := resultTime.Format("01")
 	day1 := resultTime.Day()
-	Ymd = strconv.Itoa(year) + "." + month + "." + strconv.Itoa(day1)
+	if day1 < 10 {
+		Ymd = strconv.Itoa(year) + "." + month + ".0" + strconv.Itoa(day1)
+	} else {
+		Ymd = strconv.Itoa(year) + "." + month + "." + strconv.Itoa(day1)
+	}
 	return Ymd
 }
 
 //判断时间是当年的第几周
 func WeekByDate(t time.Time) string {
 	var resultSAtr string
+	t = t.AddDate(0, 0, -8) // 减少八天跟老数据标题统一
 	yearDay := t.YearDay()
 	yearFirstDay := t.AddDate(0, 0, -yearDay+1)
 	firstDayInWeek := int(yearFirstDay.Weekday())