新增用户统计

controllers/chart_collect_stat.go

@@ -68,7 +68,7 @@ func (this *ChartCollectStatController) UserStat() {
 			}
 		}
 		if len(businessIdsSlice) > 0 {
-			condition += ` AND u.eta_business_id IN (` + utils.GetOrmInReplace(len(businessIdsSlice)) + `) `
+			condition += ` AND eta_business_id IN (` + utils.GetOrmInReplace(len(businessIdsSlice)) + `) `
 			pars = append(pars, businessIdsSlice)
 		}
 	}
@@ -79,7 +79,7 @@ func (this *ChartCollectStatController) UserStat() {
 			br.Msg = "请选择正确的开始日期"
 			return
 		}
-		condition += ` AND s.collect_date >= ? `
+		condition += ` AND collect_date >= ? `
 		pars = append(pars, startDate)
 	}
 	if endDate != "" {
@@ -89,14 +89,14 @@ func (this *ChartCollectStatController) UserStat() {
 			br.Msg = "请选择正确的结束日期"
 			return
 		}
-		condition += ` AND s.collect_date < ? `
+		condition += ` AND collect_date < ? `
 		nextDate := endTime.AddDate(0, 0, 1).Format(utils.FormatDate)
 		pars = append(pars, nextDate)
 	}
 	order := ""
-	if sortParam == "CollectDate" {
+	if sortParam == "LastCollectChartTime" {
 		if sortType == "desc" || sortType == "asc" {
-			order = sortParam + " " + sortType
+			order = " last_collect_chart_time " + sortType
 		}
 	}
 	statObj := new(chart_collect.UserCollectChartStat)
@@ -108,10 +108,10 @@ func (this *ChartCollectStatController) UserStat() {
 		return
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(models.UserListResp)
-	userList := make([]*models.BusinessUser, 0)
+	resp := new(chart_collect.UserStatListResp)
+	list := make([]*chart_collect.UserCollectChartStatItem, 0)
 	if total == 0 {
-		resp.List = userList
+		resp.List = list
 		resp.Paging = page
 		br.Ret = 200
 		br.Success = true
@@ -119,7 +119,7 @@ func (this *ChartCollectStatController) UserStat() {
 		br.Data = resp
 		return
 	}
-	list, err := statObj.GetPageListByCondition(condition, pars, order, startSize, pageSize)
+	list, err = statObj.GetPageListByCondition(condition, pars, order, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
@@ -129,9 +129,6 @@ func (this *ChartCollectStatController) UserStat() {
 	businessCodeStr := make([]string, 0)
 	businessCodeMap := make(map[string]string)
 	for _, v := range list {
-		if _, ok := businessCodeMap[v.BusinessCode]; ok {
-			continue
-		}
 		businessCodeStr = append(businessCodeStr, v.BusinessCode)
 	}
 	obj := new(eta_business.EtaBusiness)
@@ -153,7 +150,7 @@ func (this *ChartCollectStatController) UserStat() {
 			v.BusinessName = businessName
 		}
 	}
-	resp.List = userList
+	resp.List = list
 	resp.Paging = page
 	br.Ret = 200
 	br.Success = true

models/chart_collect/stat.go

@@ -48,7 +48,7 @@ func GetUserCollectChartStatByUserIdAndCollectDate(userId int, collectDate strin
 // 获取该用户数量
 func (u *UserCollectChartStat) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrm()
-	tmpSql := `SELECT s.* FROM user_collect_chart_stat AS s LEFT JOIN user AS u on s.user_id=u.user_id WHERE 1=1  `
+	tmpSql := `SELECT * FROM user_collect_chart_stat WHERE 1=1 `
 	if condition != "" {
 		tmpSql += condition
 	}
@@ -60,14 +60,14 @@ func (u *UserCollectChartStat) GetCountByCondition(condition string, pars []inte
 // 获取该用户列表
 func (u *UserCollectChartStat) GetPageListByCondition(condition string, pars []interface{}, order string, startSize, pageSize int) (items []*UserCollectChartStatItem, err error) {
 	o := orm.NewOrm()
-	tmpSql := `SELECT s.*, u.last_collect_chart_time, u.business_code, u.real_name, u.eta_business_id FROM user_collect_chart_stat AS s LEFT JOIN user AS u on s.user_id=u.user_id WHERE 1=1 `
+	tmpSql := `SELECT * FROM user_collect_chart_stat WHERE 1=1 `
 	if condition != "" {
 		tmpSql += condition
 	}
 	if order != "" {
-		tmpSql += ` ORDER BY ` + order + " s.chart_collect_stat_id DESC"
+		tmpSql += ` ORDER BY ` + order + " user_chart_stat_id DESC"
 	} else {
-		tmpSql += ` ORDER BY s.chart_collect_stat_id DESC`
+		tmpSql += ` ORDER BY user_chart_stat_id DESC`
 	}
 	tmpSql += ` Limit ?,?`
 	_, err = o.Raw(tmpSql, pars, startSize, pageSize).QueryRows(&items)