no message

controllers/activity.go

@@ -429,7 +429,7 @@ func (this *ActivityCoAntroller) ScheduleList() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	var list []*models.CygxActivityList
+	var list []*models.ActivityDetail
 	//全部都是进行中的活动
 	if totalCount > currentIndex*pageSize {
 		condition += ` AND art.active_state IN(2) `

models/activity.go

@@ -110,6 +110,13 @@ type ActivityDetail struct {
 	IsHideAppointment       int    `description:"是否隐藏预约纪要按钮  1是，0 否"`
 	IsCClassMeeting         bool   `description:"是否是c类电话会"`
 	ArticleList             []*ActivityArticleResp
+	// 列表添加的部分结构体
+	IsBrackets        int    `description:"是否有方括号 1是 ，0 否"`
+	Label             string `description:"主题标签"`
+	ImgUrl            string `description:"图片链接"`
+	ImgUrlText        string `description:"图片链接文字"`
+	ActivityType      int    `description:"活动线上线下类型 1线上，0 线下"`
+	JmcjRoadshowTitle string `description:"进门财经手动匹配的活动名称"`
 }
 
 type CygxActivityResp struct {
@@ -151,7 +158,7 @@ func GetAddActivityInfoByIdShow(uid, ActivityId int) (item *ActivityDetail, err
 	return
 }
 
-//活动详情
+//活动列表
 type CygxActivityList struct {
 	ActivityId              int    `orm:"column(activity_id);pk";description:"活动ID 等于0新增活动，大于0修改活动"`
 	ActivityTypeId          int    `description:"活动类型id"`
@@ -188,13 +195,13 @@ type CygxActivityList struct {
 
 type GetCygxActivityListRep struct {
 	Paging *paging.PagingItem `description:"分页数据"`
-	List   []*CygxActivityList
+	List   []*ActivityDetail
 	Label  string `description:"主题"`
 	ImgUrl string `description:"图片路径"`
 }
 
 //列表
-func GetActivityListAll(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*CygxActivityList, err error) {
+func GetActivityListAll(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*ActivityDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.* ,t.activity_type,t.img_url_text,c.image_url as  img_url,
 		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ?   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS is_signup,
@@ -253,7 +260,7 @@ func GetScheduleCount(condition string, uid int) (count int, err error) {
 }
 
 //我的日程列表
-func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*CygxActivityList, err error) {
+func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*ActivityDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.*,t.activity_type,t.img_url_text,c.image_url as  img_url,
 			( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ? AND s.is_cancel = 0 AND s.do_fail_type = 0) AS is_signup,