提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/user_business_analysis.go

@@ -183,10 +183,10 @@ func getLastCountDate() int64 {
 	return pageStartTime.Unix()
 }
 
-func QueryUserStaticDataByTableName(page int, pageSize int, tableName string) ([]*UserBusinessAnalysisAll, int64) {
+func QueryUserStaticDataByTableName(page int, pageSize int, tableName string, queryObj interface{}) ([]*UserBusinessAnalysisAll, int64) {
 	statictisSess := xStatistic.NewSession()
 	defer statictisSess.Close()
-	allCount, err := statictisSess.Count(tableName)
+	allCount, err := statictisSess.Count(queryObj)
 	if err != nil {
 		log.Info("query error." + err.Error())
 		return nil, 0

routers/repo/user_data_analysis.go

@@ -15,7 +15,7 @@ import (
 	"github.com/360EntSecGroup-Skylar/excelize/v2"
 )
 
-func queryUserDataPage(ctx *context.Context, tableName string) {
+func queryUserDataPage(ctx *context.Context, tableName string, queryObj interface{}) {
 	page := ctx.QueryInt("page")
 	if page <= 0 {
 		page = 1
@@ -24,7 +24,7 @@ func queryUserDataPage(ctx *context.Context, tableName string) {
 	if pageSize <= 0 {
 		pageSize = setting.UI.IssuePagingNum
 	}
-	re, count := models.QueryUserStaticDataByTableName(page, pageSize, tableName)
+	re, count := models.QueryUserStaticDataByTableName(page, pageSize, tableName, queryObj)
 	mapInterface := make(map[string]interface{})
 	mapInterface["data"] = re
 	mapInterface["count"] = count
@@ -32,31 +32,31 @@ func queryUserDataPage(ctx *context.Context, tableName string) {
 }
 
 func QueryUserStaticCurrentMonth(ctx *context.Context) {
-	queryUserDataPage(ctx, "public.user_business_analysis_current_month")
+	queryUserDataPage(ctx, "public.user_business_analysis_current_month", new(models.UserBusinessAnalysisCurrentMonth))
 }
 
 func QueryUserStaticCurrentWeek(ctx *context.Context) {
-	queryUserDataPage(ctx, "public.user_business_analysis_current_week")
+	queryUserDataPage(ctx, "public.user_business_analysis_current_week", new(models.UserBusinessAnalysisCurrentWeek))
 }
 
 func QueryUserStaticCurrentYear(ctx *context.Context) {
-	queryUserDataPage(ctx, "public.user_business_analysis_current_year")
+	queryUserDataPage(ctx, "public.user_business_analysis_current_year", new(models.UserBusinessAnalysisCurrentYear))
 }
 
 func QueryUserStaticLast30Day(ctx *context.Context) {
-	queryUserDataPage(ctx, "public.user_business_analysis_last30_day")
+	queryUserDataPage(ctx, "public.user_business_analysis_last30_day", new(models.UserBusinessAnalysisLast30Day))
 }
 
 func QueryUserStaticLastMonth(ctx *context.Context) {
-	queryUserDataPage(ctx, "public.user_business_analysis_last_month")
+	queryUserDataPage(ctx, "public.user_business_analysis_last_month", new(models.UserBusinessAnalysisLastMonth))
 }
 
 func QueryUserStaticYesterday(ctx *context.Context) {
-	queryUserDataPage(ctx, "public.user_business_analysis_yesterday")
+	queryUserDataPage(ctx, "public.user_business_analysis_yesterday", new(models.UserBusinessAnalysisYesterday))
 }
 
 func QueryUserStaticAll(ctx *context.Context) {
-	queryUserDataPage(ctx, "public.user_business_analysis_all")
+	queryUserDataPage(ctx, "public.user_business_analysis_all", new(models.UserBusinessAnalysisAll))
 }
 
 func QueryUserStaticDataPage(ctx *context.Context) {