no message

controllers/activity_special.go

@@ -20,6 +20,7 @@ type ActivitySpecialController struct {
 // @Param   PageSize   query   int  true       "每页数据条数"
 // @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
+// @Param   ActiveState   query   string  false       "活动进行状态 未开始：1、进行中2、已结束3"
 // @Param   WhichDay   query   string  false       "哪一天 今天：1、明天:2， 本周：3 上周：4,本月：5上月：6多个用 , 隔开"
 // @Success 200 {object} models.GetCygxActivitySpecialDetailListResp
 // @router /list [get]
@@ -39,6 +40,7 @@ func (this *ActivitySpecialController) SpecialList() {
 	currentIndex, _ := this.GetInt("CurrentIndex")
 	chartPermissionIds := this.GetString("ChartPermissionIds")
 	whichDay := this.GetString("WhichDay")
+	activeState := this.GetString("ActiveState")
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
 	}
@@ -46,7 +48,7 @@ func (this *ActivitySpecialController) SpecialList() {
 		currentIndex = 1
 	}
 
-	conditionActivity := services.ActivityLabelSpecialSql(chartPermissionIds, whichDay)
+	conditionActivity := services.ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState)
 
 	list, total, errList := services.GetActivitySpecialList(user, currentIndex, pageSize, "", conditionActivity)
 	if errList != nil {

services/activity.go

@@ -401,7 +401,7 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem) (i
 			//专家电话会 1
 			if articleDetail.ActivityTypeId == 1 {
 				articleDetail.IsShowOutboundCall = true
-				if articleDetail.IsLimitPeople > 0 {
+				if articleDetail.IsLimitPeople == 0 {
 					articleDetail.IsShowMeetingReminder = true
 					articleDetail.IsShowHelpSsk = true
 				}

services/activity_button.go

@@ -320,7 +320,7 @@ func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserIt
 			//专家电话会 1
 			if articleDetail.ActivityTypeId == 1 {
 				articleDetail.IsShowOutboundCall = true
-				if articleDetail.IsLimitPeople > 0 {
+				if articleDetail.IsLimitPeople == 0 {
 					articleDetail.IsShowMeetingReminder = true
 					articleDetail.IsShowHelpSsk = true
 				}

services/activity_special.go

@@ -14,7 +14,7 @@ import (
 //	UpdateCygxActivitySpecialSignupNum()
 //}
 
-func ActivityLabelSpecialSql(chartPermissionIds, whichDay string) (condition string) {
+func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (condition string) {
 
 	//行业名称
 	if len(chartPermissionIds) > 0 {
@@ -59,6 +59,10 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay string) (condition str
 		condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
 		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
 	}
+	if activeState == "2" {
+		condition += ` AND art.activity_time <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
+		condition += ` AND art.activity_time_end <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
+	}
 	return
 }