Browse Source

活动类型搜索

xingzai 3 years ago
parent
commit
21219da2cf
1 changed files with 8 additions and 0 deletions
  1. 8 0
      controllers/activity.go

+ 8 - 0
controllers/activity.go

@@ -2280,6 +2280,7 @@ func (this *ActivityCoAntroller) LabelMoreList() {
 // @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
 // @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
 // @Param   WhichDay   query   string  false       "哪一天 今天:1、明天:2,多个用 , 隔开"
 // @Param   WhichDay   query   string  false       "哪一天 今天:1、明天:2,多个用 , 隔开"
 // @Param   ActiveState   query   string  false       "活动进行状态 未开始:1、进行中2、已结束3"
 // @Param   ActiveState   query   string  false       "活动进行状态 未开始:1、进行中2、已结束3"
+// @Param   ActivityTypeId   query   string  false     "活动类型id 多个用 , 隔开"
 // @Success 200 {object} models.GetCygxActivityListRep
 // @Success 200 {object} models.GetCygxActivityListRep
 // @router /listNew [get]
 // @router /listNew [get]
 func (this *ActivityCoAntroller) ActivityListNew() {
 func (this *ActivityCoAntroller) ActivityListNew() {
@@ -2301,6 +2302,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	chartPermissionIds := this.GetString("ChartPermissionIds")
 	chartPermissionIds := this.GetString("ChartPermissionIds")
 	whichDay := this.GetString("WhichDay")
 	whichDay := this.GetString("WhichDay")
 	activeState := this.GetString("ActiveState")
 	activeState := this.GetString("ActiveState")
+	activityTypeId := this.GetString("ActivityTypeId")
 	if label == "undefined" {
 	if label == "undefined" {
 		label = ""
 		label = ""
 	}
 	}
@@ -2313,6 +2315,9 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	if activeState == "undefined" {
 	if activeState == "undefined" {
 		activeState = ""
 		activeState = ""
 	}
 	}
+	if activityTypeId == "undefined" {
+		activityTypeId = ""
+	}
 	var startSize int
 	var startSize int
 	if pageSize <= 0 {
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
 		pageSize = utils.PageSize20
@@ -2377,6 +2382,9 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	} else {
 	} else {
 		condition += ` AND art.active_state  IN (1)`
 		condition += ` AND art.active_state  IN (1)`
 	}
 	}
+	if activityTypeId != "" {
+		condition += ` AND art.activity_type_id  IN (` + activityTypeId + `)`
+	}
 
 
 	condition += ` AND art.publish_status = 1 `
 	condition += ` AND art.publish_status = 1 `
 	var conditionOr string
 	var conditionOr string