|
|
@@ -142,11 +142,11 @@ func GetQuarterData(adminType, dimensionType string) (adminDataMapList []AdminDa
|
|
|
nowQuarterFirstDay := utils.GetNowQuarterFirstDay() //本季度第一天
|
|
|
nowQuarterLastDay := nowQuarterFirstDay.AddDate(0, 3, 0).Add(-1 * time.Second) //本季度最后一天
|
|
|
|
|
|
- lastQuarterFirstDay1 := nowQuarterFirstDay.AddDate(0, -3, 0) //上个季度第一天
|
|
|
- lastQuarterLastDay1 := lastQuarterFirstDay1.AddDate(0, 1, 0).Add(-1 * time.Second) //上个季度最后一天
|
|
|
+ lastQuarterFirstDay1 := nowQuarterFirstDay.AddDate(0, -3, 0) //上个季度第一天
|
|
|
+ lastQuarterLastDay1 := nowQuarterFirstDay.AddDate(0, 0, 0).Add(-1 * time.Second) //上个季度最后一天
|
|
|
|
|
|
- lastQuarterFirstDay2 := nowQuarterFirstDay.AddDate(0, -6, 0) //上上个季度第一天
|
|
|
- lastQuarterLastDay2 := lastQuarterFirstDay2.AddDate(0, 1, 0).Add(-1 * time.Second) //上上个季度最后一天
|
|
|
+ lastQuarterFirstDay2 := nowQuarterFirstDay.AddDate(0, -6, 0) //上上个季度第一天
|
|
|
+ lastQuarterLastDay2 := nowQuarterFirstDay.AddDate(0, -3, 0).Add(-1 * time.Second) //上上个季度最后一天
|
|
|
|
|
|
ch1 := make(chan AdminDataMap, 0)
|
|
|
ch2 := make(chan AdminDataMap, 0)
|
