Merge branch 'V20220630' of git.openi.org.cn:OpenI/aiforge into multi-dataset

routers/api/v1/repo/repo_dashbord.go

@@ -887,19 +887,12 @@ func getTimePeroid(ctx *context.Context, recordBeginTime time.Time) (time.Time,
 		if queryType == "all" {
 			beginTime = recordBeginTimeTemp
 			endTime = now
-		} else if queryType == "today" {
+		} else if queryType == "yesterday" {
 			endTime = now
 			beginTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 0, 0, 0, 0, now.Location())
-		} else if queryType == "yesterday" {
-			endTime = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
-			beginTime = endTime.AddDate(0, 0, -1)
 
-		} else if queryType == "last_7day" {
-			beginTime = now.AddDate(0, 0, -7)
-			beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location())
-			endTime = now
-		} else if queryType == "last_30day" {
-			beginTime = now.AddDate(0, 0, -30)
+		} else if queryType == "current_week" {
+			beginTime = now.AddDate(0, 0, -int(time.Now().Weekday())+2) //begin from monday
 			beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location())
 			endTime = now
 		} else if queryType == "current_month" {