no message

controllers/activity.go

@@ -87,17 +87,12 @@ func (this *ActivityController) LabelTypeList() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-
 	if len(speciaItem.List) == 0 {
 		speciaItem.List = make([]*models.CygxActivityLabelList, 0)
 	}
-
-	list = append(list, speciaItem)
-	//if len(speciaItem.List) > 0 {
-	//
-	//} else {
-	//	speciaItem.List = make([]*models.CygxActivityLabelList, 0)
-	//}
+	if speciaItem.ActivityTypeId > 0 {
+		list = append(list, speciaItem)
+	}
 
 	resp := new(models.ActivityTypeListHomeResp)
 	resp.List = list

controllers/home.go

@@ -261,6 +261,7 @@ func (this *MobileHomeController) NewList() {
 		br.Ret = 408
 		return
 	}
+	//uid := user.UserId
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
 
@@ -275,18 +276,61 @@ func (this *MobileHomeController) NewList() {
 	startSize = paging.StartIndex(currentIndex, pageSize)
 
 	var condition string
+	var conditionInit string
 	var pars []interface{}
 	var total int
 	resp := new(models.HomeResourceDataListResp)
-
-	//condition += " AND source = 'article' "
-	condition += " AND publish_date  < ? "
-	pars = append(pars, time.Now().AddDate(0, 0, 30))
-
+	//查询近一个月的数据
+	conditionInit = " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
 	if user.CompanyId <= 1 {
 		condition += " AND source IN ('roadshow','article','newchart') "
 		startSize = 0
 		pageSize = utils.PageSize5
+	} else {
+		condition += ` AND source NOT IN ('activity','activityspecial') ` + conditionInit
+		conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
+			return
+		}
+		conditionActivity += ` AND art.is_limit_people = 1 AND art.publish_status = 1 `
+		var conditionOrder string
+		conditionOrder = ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
+		conditionActivity += conditionOrder
+		listActivity, err := models.GetActivityListHomeNew(conditionActivity, 0, 200)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取可见活动数据失败，Err:" + err.Error()
+			return
+		}
+
+		var activityIds []int
+		for _, v := range listActivity {
+			activityIds = append(activityIds, v.ActivityId)
+		}
+		lenActivityIds := len(activityIds)
+		if lenActivityIds > 0 {
+			condition += ` OR ( source = 'activity' AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) ` + conditionInit + ` )    `
+			pars = append(pars, activityIds)
+		}
+
+		listActivitySpecial, _, err := services.GetActivitySpecialList(user, 0, 200, "", "", "")
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取专项调研可见权限失败失败，Err:" + err.Error()
+			return
+		}
+
+		var activityspecialIds []int
+		for _, v := range listActivitySpecial {
+			activityspecialIds = append(activityspecialIds, v.ActivityId)
+		}
+		lenActivityspecialIds := len(activityspecialIds)
+		if lenActivityspecialIds > 0 {
+			condition += ` OR ( source = 'activityspecial' AND source_id IN (` + utils.GetOrmInReplace(lenActivityspecialIds) + `) ` + conditionInit + ` )   `
+			pars = append(pars, activityspecialIds)
+		}
 	}
 	total, err := models.GetResourceDataCount(condition, pars)
 	if err != nil {

models/activity.go

@@ -285,6 +285,21 @@ func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pa
 	return
 }
 
+//列表
+func GetActivityListHomeNew(condition string, startSize, pageSize int) (items []*ActivityDetail, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT activity_id
+		FROM cygx_activity as art
+		INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id
+		INNER JOIN  chart_permission  AS c ON c.chart_permission_id = art.chart_permission_id  WHERE 1= 1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` LIMIT ?,?`
+	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	return
+}
+
 type GetCygxActivityListRep struct {
 	Paging                 *paging.PagingItem `description:"分页数据"`
 	List                   []*ActivityListResp

services/activity_special.go

@@ -229,10 +229,13 @@ func HandleActivityLabelSpecialTripPermission(user *models.WxUserItem) (conditio
 //获取预报名列表
 func GetActivitySpecialPrepareList(user *models.WxUserItem, startSize, pageSize int, keywords, conditionActivity string) (list []*models.CygxActivitySpecialDetail, totalPrepare int, err error) {
 	companyDetail, e := models.GetCompanyDetailByIdGroupTrip(user.CompanyId)
-	if e != nil {
+	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetCompanyDetailByIdGroupTrip, Err: " + e.Error())
 		return
 	}
+	if companyDetail == nil {
+		return
+	}
 	//如果是永续的就按照普通的权限逻辑来查，如果不是就按照升级的逻辑来查
 	var condition string
 	if companyDetail.Status == "永续" {
@@ -276,10 +279,14 @@ state 进行状态 1：未开始，2：进行中，3：已结束,4:未开始、
 func GetActivityLabelSpecialConfirmList(user *models.WxUserItem, startSize, pageSize, state int, keywords, conditionActivity string) (list []*models.CygxActivitySpecialDetail, totalConfirm int, err error) {
 	//var condition string
 	companyDetail, e := models.GetCompanyDetailByIdGroupTrip(user.CompanyId)
-	if e != nil {
+	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetCompanyDetailByIdGroupTrip, Err: " + e.Error())
 		return
 	}
+	if companyDetail == nil {
+		return
+	}
+
 	//如果是永续的就按照普通的权限逻辑来查，如果不是就按照升级的逻辑来查
 	var condition string
 	if companyDetail.Status == "永续" {
@@ -436,7 +443,7 @@ func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int,
 	}
 	listPrepare, totalPrepare, e := GetActivitySpecialPrepareList(user, startSizePrepare, pageSizePrepare, keywords, conditionActivity)
 	if e != nil {
-		err = errors.New("GetActivityLabelSpecialConfirmList, Err: " + e.Error())
+		err = errors.New("GetActivitySpecialPrepareList, Err: " + e.Error())
 		return
 	}
 	if len(listPrepare) > 0 {

services/resource_data.go

@@ -127,8 +127,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		for _, vss := range activityIds {
 			imgUrlResp += strconv.Itoa(vss) + ","
 		}
-		fmt.Println(imgUrlResp)
-		fmt.Println(activityIds)
 		pars = make([]interface{}, 0)
 		condition = ` AND art.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `)   `
 		pars = append(pars, activityIds)
@@ -137,8 +135,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			err = errors.New("GetResourceDataList, Err: " + e.Error())
 			return
 		}
-		//fmt.Println(len(activityList), "activityList")
-
 		var activityListRersp []*models.ActivityListResp
 		for _, v := range activityList {
 			activityListRersp = append(activityListRersp, ActivityButtonShow(v, user))
@@ -177,9 +173,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			mapItems[fmt.Sprint("activity", v.ActivityId)].Expert = v.Expert
 			mapItems[fmt.Sprint("activity", v.ActivityId)].Speaker = v.Speaker
 			mapItems[fmt.Sprint("activity", v.ActivityId)].YidongActivityUrl = v.YidongActivityUrl
-			//mapItems[fmt.Sprint("activity", v.ActivityId)].PublishDate = v.ActivityTime
 			mapItems[fmt.Sprint("activity", v.ActivityId)].ImgUrl = imgUrlResp
-			//fmt.Println(v)
 		}
 	}
 
@@ -197,7 +191,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			mapItems[fmt.Sprint("newchart", v.ChartId)].Title = v.Title
 			mapItems[fmt.Sprint("newchart", v.ChartId)].ImgUrl = v.BodyHtml
 			mapItems[fmt.Sprint("newchart", v.ChartId)].IsTop = v.IsTop
-			//mapItems[fmt.Sprint("newchart", v.ChartId)].PublishDate = v.CreateDate
 		}
 	}
 
@@ -216,8 +209,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			err = errors.New("GetSpecialTripUserMap, Err: " + e.Error())
 			return
 		}
-		//fmt.Println(activitySpeciallist)
-		//fmt.Println(mapChart)
 		for _, v := range activitySpeciallist {
 			if mapChart[v.ChartPermissionName] != "" {
 				imgUrlResp = mapChart[v.ChartPermissionName]
@@ -246,7 +237,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].Title = v.ResearchTheme
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityType = v.SpecialType
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].City = v.City
-
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTime = v.ActivityTime
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsSignup = v.IsSignup
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ImgUrl = imgUrlResp
@@ -269,11 +259,9 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			mapItems[fmt.Sprint("roadshow", v.VideoId)].PublishDate = v.CreateTime.Format(utils.FormatDateTime)
 		}
 	}
-	//mapActivityVideoId := make(map[int]int)
 	//处理路活动视频
 	if len(activityvideoIds) > 0 {
 		pars = make([]interface{}, 0)
-		fmt.Println(activityvideoIds)
 		condition = ` AND video_id IN (` + utils.GetOrmInReplace(len(activityvideoIds)) + `)`
 		pars = append(pars, activityvideoIds)
 		activityVideoList, e := models.GetActivityVideoList(condition, pars, 0, len(activityvideoIds))
@@ -281,7 +269,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			err = errors.New("GetResourceDataList, Err: " + e.Error())
 			return
 		}
-		fmt.Println(activityVideoList, "activityVideoList")
 		//// 获取默认图配置
 		_, videoMap, _, _, e := GetMicroRoadShowDefaultImgConfig()
 		if e != nil {
@@ -289,14 +276,9 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			return
 		}
 		for _, v := range activityVideoList {
-			fmt.Println(v.ActivityId)
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].Title = v.VideoName
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ImgUrl = videoMap[v.ChartPermissionId]
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ChartPermissionId = v.ChartPermissionId
-
-			//mapActivityVideoId[v.VideoId] = v.ActivityId
-			//mapItems[fmt.Sprint("activityvideo", v.VideoId)].SourceId = v.ActivityId
-			//mapItems[fmt.Sprint("activityvideo", v.VideoId)].PublishDate = utils.TimeRemoveHms(v.CreateTime)
 		}
 	}
 
@@ -354,7 +336,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	}
 	for _, vList := range list {
 		for _, v := range mapItems {
-
 			if v.SourceId == vList.SourceId {
 				items = append(items, v)
 			}