소스 검색

no message

xingzai 2 년 전
부모
커밋
43913cd9a8
4개의 변경된 파일7개의 추가작업 그리고 0개의 파일을 삭제
  1. 1 0
      controllers/activity.go
  2. 4 0
      models/activity.go
  3. 1 0
      services/activity.go
  4. 1 0
      services/resource_data.go

+ 1 - 0
controllers/activity.go

@@ -1696,6 +1696,7 @@ func (this *ActivityController) ActivityListSearch() {
 		item.PublishDate = v.ActivityTime
 		item.FileType = v.FileType
 		item.IsYidongConduct = v.IsYidongConduct
+		item.IsCanOutboundCall = v.IsCanOutboundCall
 		if v.VoiceList != nil || v.VideoDetail != nil {
 			item.AudioLink = true
 			if v.FileType == 1 {

+ 4 - 0
models/activity.go

@@ -390,6 +390,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			1 AS source_type,
             t.img_url_text,
             art.is_yidong_conduct,
+            art.is_can_outbound_call,
 			art.activity_time 
 		FROM
 			cygx_activity AS art
@@ -420,6 +421,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			2 AS source_type,
 			"",
 			"",
+			"",
 			art.activity_time 
 		FROM
 			cygx_activity_special AS art
@@ -513,6 +515,7 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			0 AS days,
 			art.city AS city,
 			art.is_yidong_conduct,
+			art.is_can_outbound_call,
 			art.host 
 		FROM
 			cygx_activity AS art
@@ -547,6 +550,7 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			art.days,
 			art.city,
 			"",
+			"",
 			art.host 
 		FROM
 			cygx_activity_special AS art

+ 1 - 0
services/activity.go

@@ -552,6 +552,7 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem) (i
 		Days:                    v.Days,
 		SignupType:              v.SignupType,
 		IsYidongConduct:         v.IsYidongConduct,
+		IsCanOutboundCall:       v.IsCanOutboundCall,
 		TencentConferenceNumber: v.TencentConferenceNumber,
 	}
 	au := new(models.UserPermissionAuthInfo)

+ 1 - 0
services/resource_data.go

@@ -179,6 +179,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			mapItems[fmt.Sprint("activity", v.ActivityId)].SignupType = mapActivitySignup[v.ActivityId]
 			mapItems[fmt.Sprint("activity", v.ActivityId)].ActivityTypeId = v.ActivityTypeId
 			mapItems[fmt.Sprint("activity", v.ActivityId)].IsYidongConduct = v.IsYidongConduct
+			mapItems[fmt.Sprint("activity", v.ActivityId)].IsCanOutboundCall = v.IsCanOutboundCall
 		}
 	}