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