/修改专项调研，用户与公司的参与数量过滤掉已删除的活动

models/activity_special_signup.go

@@ -73,18 +73,20 @@ type CygxActivitySpecialSignupResp struct {
 }
 
 //列表
-func GetActivityListSpecialGroupByMobile() (items []*CygxActivitySpecialSignupResp, err error) {
+func GetActivityListSpecialGroupByMobile(condition string, pars []interface{}) (items []*CygxActivitySpecialSignupResp, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT *,	COUNT( 1 ) AS count   FROM cygx_activity_special_signup   GROUP BY mobile`
-	_, err = o.Raw(sql).QueryRows(&items)
+	sql := `SELECT s.*,	COUNT( 1 ) AS count   FROM cygx_activity_special_signup as s INNER JOIN cygx_activity_special AS a ON a.activity_id = s.activity_id
+			INNER JOIN wx_user AS u ON u.user_id = s.user_id ` + condition + `  GROUP BY s.mobile`
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
 //列表
-func GetActivityListSpecialGroupByCompanyId() (items []*CygxActivitySpecialSignupResp, err error) {
+func GetActivityListSpecialGroupByCompanyId(condition string, pars []interface{}) (items []*CygxActivitySpecialSignupResp, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT *,	COUNT( 1 ) AS count   FROM cygx_activity_special_signup   GROUP BY company_id`
-	_, err = o.Raw(sql).QueryRows(&items)
+	sql := `SELECT *,	COUNT( 1 ) AS count   FROM cygx_activity_special_signup   as s INNER JOIN cygx_activity_special AS a ON a.activity_id = s.activity_id
+			INNER JOIN wx_user AS u ON u.user_id = s.user_id ` + condition + `  GROUP BY s.company_id`
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 

services/activity_special.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
+	"time"
 )
 
 //func init() {
@@ -21,7 +22,11 @@ func UpdateCygxActivitySpecialSignupNum(cont context.Context) (err error) {
 		}
 	}()
 	//根据手机号分组获取列表以及数量
-	listSpecial, err := models.GetActivityListSpecialGroupByMobile()
+	var condition string
+	var pars []interface{}
+	condition += ` AND  s.create_time < ? `
+	pars = append(pars, time.Now().Format(utils.FormatDate))
+	listSpecial, err := models.GetActivityListSpecialGroupByMobile(condition, pars)
 	if err != nil {
 		return err
 	}
@@ -49,7 +54,7 @@ func UpdateCygxActivitySpecialSignupNum(cont context.Context) (err error) {
 	}
 
 	//根据CompanyId分组获取列表以及数量
-	listSpecialByCompanyId, err := models.GetActivityListSpecialGroupByCompanyId()
+	listSpecialByCompanyId, err := models.GetActivityListSpecialGroupByCompanyId(condition, pars)
 	if err != nil {
 		return err
 	}