Browse Source

no message

xingzai 2 years ago
parent
commit
acbdf24546
2 changed files with 3 additions and 2 deletions
  1. 2 1
      models/activity.go
  2. 1 1
      services/activity.go

+ 2 - 1
models/activity.go

@@ -58,6 +58,7 @@ type CygxActivity struct {
 	AdminName               string    `description:"销售/管理员姓名"`
 	IsCanAppointmentMinutes int       `description:"是否可预约纪要 1是 ,0 否 默认0 "`
 	YidongActivityId        string    `description:"易董活动ID"`
+	IsExternalLabel         int       `description:"是否为外部资源 1是,0否"`
 }
 
 // 活动详情
@@ -232,7 +233,7 @@ type CygxActivityResp struct {
 // 列表
 func GetCygxActivityList(condition string, pars []interface{}, sortTime string, startSize, pageSize int) (items []*CygxActivity, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT	activity_id,city, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id , activity_type_id 
+	sql := `SELECT	activity_id,city, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id , activity_type_id,is_external_label
 		FROM cygx_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

+ 1 - 1
services/activity.go

@@ -355,7 +355,7 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		}
 		item.Resource = 1
 		item.ActivityId = v.ActivityId
-		if v.YidongActivityId != "" {
+		if v.IsExternalLabel > 0 {
 			item.IsExternalLabel = true
 		}
 		item.City = v.City