|
|
@@ -1647,7 +1647,11 @@ func adjustToNearestDekad(date time.Time) time.Time {
|
|
|
lastDayOfMonth := getLastDayOfMonth(date).Day()
|
|
|
|
|
|
// 这里有些无可奈何了，暂时这么写吧。。。需要跟据润 平年根据每个月进行单独处理
|
|
|
- if day > 5 && day <= 15 {
|
|
|
+ if day < 5 {
|
|
|
+ dateOneMonthAgo := date.AddDate(0, -1, 0)
|
|
|
+ lastDayOfMonth2 := getLastDayOfMonth(dateOneMonthAgo).Day()
|
|
|
+ return time.Date(date.Year(), date.Month()-1, lastDayOfMonth2, 0, 0, 0, 0, date.Location())
|
|
|
+ } else if day > 5 && day <= 15 {
|
|
|
return time.Date(date.Year(), date.Month(), 10, 0, 0, 0, 0, date.Location())
|
|
|
} else if day > 11 && day <= 25 {
|
|
|
return time.Date(date.Year(), date.Month(), 20, 0, 0, 0, 0, date.Location())
|
gmy