chenyh
/
vRp.CD2g_test
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 修复 times.GetCurrWeekDate 和 times.GetLastWeekDate 在 week 参数与今日 week 相同的情况下，会多获取到一周的问题

This commit is contained in:
kercylan98 2024-02-04 12:14:46 +08:00
parent f8e368a8ca
commit 902dadad5a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/times/helper.go
View File

@ -20,7 +20,7 @@ func GetCurrWeekDate(now time.Time, week time.Weekday) time.Time {
w := int(week) w := int(week)
monday := GetMondayZero(now) monday := GetMondayZero(now)
var curr time.Time var curr time.Time
if WeekDay(now) > w { if WeekDay(now) >= w {
curr = monday.AddDate(0, 0, w-1) curr = monday.AddDate(0, 0, w-1)
} else { } else {
curr = monday.AddDate(0, 0, w-1) curr = monday.AddDate(0, 0, w-1)
@ -34,7 +34,7 @@ func GetLastWeekDate(now time.Time, week time.Weekday) time.Time {
w := int(week) w := int(week)
monday := GetMondayZero(now) monday := GetMondayZero(now)
var last time.Time var last time.Time
if WeekDay(now) > w { if WeekDay(now) >= w {
last = monday.AddDate(0, 0, -(7 - w + 1)) last = monday.AddDate(0, 0, -(7 - w + 1))
} else { } else {
last = monday.AddDate(0, 0, -(7 - w + 1)) last = monday.AddDate(0, 0, -(7 - w + 1))