fix-kanban

models/cloudbrain_static.go

@@ -349,7 +349,7 @@ func GetCardDurationStatistics(opts *DurationStatisticOptions) ([]*CloudbrainDur
 	var cond = builder.NewCond()
 	if opts.BeginTime.Unix() > 0 && opts.EndTime.Unix() > 0 {
 		cond = cond.And(
-			builder.And(builder.Gte{"cloudbrain_duration_statistic.date_time": opts.BeginTime.Unix()}, builder.Lte{"cloudbrain_duration_statistic.date_time": opts.EndTime.Unix()}),
+			builder.And(builder.Gte{"cloudbrain_duration_statistic.date_time": opts.BeginTime.Unix()}, builder.Lt{"cloudbrain_duration_statistic.date_time": opts.EndTime.Unix()}),
 		)
 	}
 	if opts.AiCenterCode != "" {

routers/repo/cloudbrain_statistic.go

@@ -25,6 +25,7 @@ func UpdateDurationStatisticHistoryData() int64 {
 	now := time.Now()
 	currentTime := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
 	statisticTime := recordBeginTime.Add(+1 * time.Hour)
+
 	for statisticTime.Before(currentTime) || statisticTime.Equal(currentTime) {
 		countEach := summaryDurationStat(statisticTime)
 		count += countEach
@@ -33,12 +34,12 @@ func UpdateDurationStatisticHistoryData() int64 {
 	return count
 }
 
+//statisticTime是当前的时辰，比如当前是2019-01-01 12:01:01，那么statisticTime就是2019-01-01 12:00:00
 func summaryDurationStat(statisticTime time.Time) int64 {
 	var count int64
-	dateTime := timeutil.TimeStamp(statisticTime.Unix())
-	dayTime := statisticTime.Format("2006-01-02")
-
+	dateTime := timeutil.TimeStamp(statisticTime.Add(-1 * time.Hour).Unix())
 	beginTime := statisticTime.Add(-1 * time.Hour).Unix()
+	dayTime := statisticTime.Add(-1 * time.Hour).Format("2006-01-02")
 	hourTime := statisticTime.Add(-1 * time.Hour).Hour()
 	endTime := statisticTime.Unix()