|
|
|
@ -2,7 +2,6 @@ package utils |
|
|
|
|
|
|
|
import ( |
|
|
|
"errors" |
|
|
|
"fmt" |
|
|
|
"log" |
|
|
|
"math" |
|
|
|
"strconv" |
|
|
|
@ -305,14 +304,11 @@ func TimeReturnMonth(now time.Time) (firstMonth string, lastMonth string) { |
|
|
|
func ParseWeekIndex(date time.Time) int { |
|
|
|
dateStr := date.Format("2006-01-02") |
|
|
|
dateStr = dateStr[:8] + "01" |
|
|
|
firstDay, _ := time.Parse("2006-01-02", dateStr) |
|
|
|
firstDay, _ := time.ParseInLocation("2006-01-02", dateStr, TimezoneLocation) |
|
|
|
firstWeekDay := firstDay.Weekday() |
|
|
|
weekDay := date.Weekday() |
|
|
|
fmt.Println("first day:", firstDay) |
|
|
|
for i:=1; i < 6; i++ { |
|
|
|
fmt.Println("i:", i) |
|
|
|
date = date.AddDate(0, 0, -7) |
|
|
|
fmt.Println("date:", date) |
|
|
|
if date.Before(firstDay) { |
|
|
|
if weekDay >= firstWeekDay { |
|
|
|
return i |
|
|
|
|
