Merge branch 'cygx/cygx_15_0_1' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/search_keyword.go

@@ -50,10 +50,10 @@ func (this *SearchKeywordController) HostKeywordList() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
 	var pars []interface{}
-	currentTime := time.Now()
-	starTime := currentTime.AddDate(0, 0, -8).Format("2006-01-02") + " 00:00:00"
-	endTime := currentTime.AddDate(0, 0, -1).Format("2006-01-02") + " 23:59:59"
-	condition += ` AND create_time < ` + "'" + endTime + "'" + `AND create_time > ` + "'" + starTime + "'"
+	starTime := time.Now().AddDate(0, 0, -8).Format(utils.FormatDate)
+	endTime := time.Now().Format(utils.FormatDate)
+	condition += ` AND create_time > ? AND create_time < ?  AND user_id > 0 `
+	pars = append(pars, starTime, endTime)
 	total, err := cygx.GetSearchKeyWordCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"

models/cygx/search_keyword.go

@@ -28,12 +28,22 @@ func GetSearchKeyWordCount(condition string, pars []interface{}) (count int, err
 
 // 获取搜索关键词列表
 func GetSearchKeyWordList(condition string, pars []interface{}, startSize, pageSize int) (items []*KeyWordList, err error) {
-	sql := `SELECT COUNT( key_word ) AS key_word_num, key_word FROM cygx_search_key_word WHERE 1= 1`
+	o := orm.NewOrmUsingDB("hz_cygx")
+	//sql := `SELECT COUNT( key_word ) AS key_word_num, key_word FROM cygx_search_key_word WHERE 1= 1`
+
+	sql := `SELECT
+				key_word,
+				MAX(id) as max_id ,
+				COUNT( DISTINCT user_id ) AS key_word_num 
+			FROM
+				cygx_search_key_word 
+			WHERE
+				1 = 1 `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY key_word ORDER BY COUNT( key_word ) DESC LIMIT ?,? `
-	o := orm.NewOrmUsingDB("hz_cygx")
+	sql += ` GROUP BY key_word ORDER BY key_word_num DESC, max_id DESC LIMIT ?,? `
+
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }