git/lancet
1
0
Fork 0
mirror of https://github.com/duke-git/lancet.git synced 2026-02-04 12:52:28 +08:00
Code Issues Projects Releases Wiki Activity

expand BeginOfWeek、EndOfWeek (#59)

Browse Source
This commit is contained in:
CyJaySong
2022-10-10 15:44:22 +08:00
committed by GitHub
parent 604acd9b07
commit 4edefcca67
1 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
datetime/datetime.go
View File

@@ -4,24 +4,24 @@
// Package datetime implements some functions to format date and time. // Package datetime implements some functions to format date and time.
// Note: // Note:
// 1. `format` param in FormatTimeToStr function should be as flow: // 1. `format` param in FormatTimeToStr function should be as flow:
//"yyyy-mm-dd hh:mm:ss" // "yyyy-mm-dd hh:mm:ss"
//"yyyy-mm-dd hh:mm" // "yyyy-mm-dd hh:mm"
//"yyyy-mm-dd hh" // "yyyy-mm-dd hh"
//"yyyy-mm-dd" // "yyyy-mm-dd"
//"yyyy-mm" // "yyyy-mm"
//"mm-dd" // "mm-dd"
//"dd-mm-yy hh:mm:ss" // "dd-mm-yy hh:mm:ss"
//"yyyy/mm/dd hh:mm:ss" // "yyyy/mm/dd hh:mm:ss"
//"yyyy/mm/dd hh:mm" // "yyyy/mm/dd hh:mm"
//"yyyy/mm/dd hh" // "yyyy/mm/dd hh"
//"yyyy/mm/dd" // "yyyy/mm/dd"
//"yyyy/mm" // "yyyy/mm"
//"mm/dd" // "mm/dd"
//"dd/mm/yy hh:mm:ss" // "dd/mm/yy hh:mm:ss"
//"yyyy" // "yyyy"
//"mm" // "mm"
//"hh:mm:ss" // "hh:mm:ss"
//"mm:ss" // "mm:ss"
package datetime package datetime
import ( import (
@@ -147,16 +147,32 @@ func EndOfDay(t time.Time) time.Time {
return time.Date(y, m, d, 23, 59, 59, int(time.Second-time.Nanosecond), t.Location()) return time.Date(y, m, d, 23, 59, 59, int(time.Second-time.Nanosecond), t.Location())
} }
// BeginOfWeek return beginning week, week begin from Sunday // BeginOfWeek return beginning week, default week begin from Sunday
func BeginOfWeek(t time.Time) time.Time { func BeginOfWeek(t time.Time, beginFrom ...time.Weekday) time.Time {
y, m, d := t.AddDate(0, 0, 0-int(BeginOfDay(t).Weekday())).Date() var beginFromWeekday = time.Sunday
return time.Date(y, m, d, 0, 0, 0, 0, t.Location()) if len(beginFrom) > 0 {
beginFromWeekday = beginFrom[0]
}
y, m, d := t.AddDate(0, 0, int(beginFromWeekday-t.Weekday())).Date()
beginOfWeek := time.Date(y, m, d, 0, 0, 0, 0, t.Location())
if beginOfWeek.After(t) {
return beginOfWeek.AddDate(0, 0, -7)
}
return beginOfWeek
} }
// EndOfWeek return end week time, week end with Saturday // EndOfWeek return end week time, default week end with Saturday
func EndOfWeek(t time.Time) time.Time { func EndOfWeek(t time.Time, endWith ...time.Weekday) time.Time {
y, m, d := BeginOfWeek(t).AddDate(0, 0, 7).Add(-time.Nanosecond).Date() var endWithWeekday = time.Saturday
return time.Date(y, m, d, 23, 59, 59, int(time.Second-time.Nanosecond), t.Location()) if len(endWith) > 0 {
endWithWeekday = endWith[0]
}
y, m, d := t.AddDate(0, 0, int(endWithWeekday-t.Weekday())).Date()
var endWithWeek = time.Date(y, m, d, 23, 59, 59, int(time.Second-time.Nanosecond), t.Location())
if endWithWeek.Before(t) {
endWithWeek = endWithWeek.AddDate(0, 0, 7)
}
return endWithWeek
} }
// BeginOfMonth return beginning of month // BeginOfMonth return beginning of month