Browse Source

销售人员显示

xingzai 3 years ago
parent
commit
2ec3ac5be1
3 changed files with 18 additions and 15 deletions
  1. 1 0
      controllers/activity.go
  2. 3 2
      models/activity.go
  3. 14 13
      models/activity_signup.go

+ 1 - 0
controllers/activity.go

@@ -894,6 +894,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
 					} else {
 						item.CountryCode = user.CountryCode
 					}
+
 					//添加报名信息,但是不加入日程
 					_, errSignup := models.AddActivitySignupNoSchedule(item)
 					if errSignup != nil {

+ 3 - 2
models/activity.go

@@ -398,13 +398,14 @@ type SignupExportRep struct {
 
 func GetSignupExport(activityId int) (item []*SignupExportRep, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT s.*  ,a.is_limit_people,u.real_name,p.seller_name
+	sql := `SELECT s.*  ,a.is_limit_people,u.real_name,
+			(SELECT p.seller_name from company_product as p WHERE p.company_id = u.company_id  AND  p.product_id = 2 )  AS seller_name
 			FROM
 			cygx_activity_signup AS s
 			LEFT JOIN wx_user AS u ON u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
 			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
-			WHERE a.activity_id = ?  AND s.fail_type = 0  `
+			WHERE a.activity_id = ?  AND s.do_fail_type = 0  `
 	_, err = o.Raw(sql, activityId).QueryRows(&item)
 	return
 }

+ 14 - 13
models/activity_signup.go

@@ -7,19 +7,20 @@ import (
 )
 
 type CygxActivitySignup struct {
-	Id             int       `orm:"column(id);pk"`
-	ActivityId     int       `description:"活动ID"`
-	UserId         int       `description:"用户ID"`
-	CreateTime     time.Time `description:"创建时间"`
-	Mobile         string    `description:"手机号"`
-	Email          string    `description:"邮箱"`
-	CompanyId      int       `description:"公司id"`
-	CompanyName    string    `description:"公司名称"`
-	FailType       int       `description:"失败原因,0,未失败,1总人数已满,2单机构超限制,3,爽约次数超限"`
-	SignupType     int       `description:"报名方式,1预约外呼,2自主拨入,3我要报名"`
-	DoFailType     int       `description:"失败原因,0,未失败,1总人数已满,2单机构超限制,3,爽约次数超限"`
-	OutboundMobile string    `description:"外呼手机号"`
-	CountryCode    string    `description:"手机国家区号"`
+	Id                  int       `orm:"column(id);pk"`
+	ActivityId          int       `description:"活动ID"`
+	UserId              int       `description:"用户ID"`
+	CreateTime          time.Time `description:"创建时间"`
+	Mobile              string    `description:"手机号"`
+	Email               string    `description:"邮箱"`
+	CompanyId           int       `description:"公司id"`
+	CompanyName         string    `description:"公司名称"`
+	FailType            int       `description:"失败原因,0,未失败,1总人数已满,2单机构超限制,3,爽约次数超限"`
+	SignupType          int       `description:"报名方式,1预约外呼,2自主拨入,3我要报名"`
+	DoFailType          int       `description:"失败原因,0,未失败,1总人数已满,2单机构超限制,3,爽约次数超限"`
+	OutboundMobile      string    `description:"外呼手机号"`
+	CountryCode         string    `description:"手机国家区号"`
+	OutboundCountryCode string    `description:"外呼手机号区号"`
 }
 
 type SignupStatus struct {