no message

controllers/roadshow/activity.go

@@ -294,10 +294,10 @@ func (this *ActivityController) List() {
 	}
 	mapSeller := make(map[int][]string)
 	for _, v := range listSeller {
-		v.RsCalendarResearcherId = v.RsActivityId
 		mapSeller[v.RsActivityId] = append(mapSeller[v.RsActivityId], v.SellerName)
 	}
 	for _, v := range dataList {
+		v.RsCalendarResearcherId = v.RsActivityId
 		v.SellerName = strings.Join(mapSeller[v.RsActivityId], ",")
 	}
 

models/roadshow/activity.go

@@ -64,22 +64,21 @@ func AddRsActivity(item *RsActivity) (lastId int64, err error) {
 }
 
 type RsActivitySeller struct {
-	RsActivitySellerId     int    `orm:"column(rs_activity_seller_id);pk"`
-	RsActivityId           int    `description:"活动id"`
-	SellerId               int    `description:"销售id"`
-	SellerName             string `description:"销售id"`
-	StartDate              string `description:"开始日期"`
-	EndDate                string `description:"结束日期"`
-	StartTime              string `description:"开始时间"`
-	EndTime                string `description:"结束时间"`
-	StartWeek              string `description:"开始日期对应周"`
-	EndWeek                string `description:"结束日期对应周"`
-	CreateTime             time.Time
-	ModifyTime             time.Time
-	Status                 int       `description:"状态:1:待接受,2:已接受,3:已拒绝,4:已删除,5:已撤回,6:已结束"`
-	DeleteReason           string    `description:"删除理由"`
-	DeleteTime             time.Time `description:"删除时间"`
-	RsCalendarResearcherId int       `description:"活动研究员id（映射供前端使用）"`
+	RsActivitySellerId int    `orm:"column(rs_activity_seller_id);pk"`
+	RsActivityId       int    `description:"活动id"`
+	SellerId           int    `description:"销售id"`
+	SellerName         string `description:"销售id"`
+	StartDate          string `description:"开始日期"`
+	EndDate            string `description:"结束日期"`
+	StartTime          string `description:"开始时间"`
+	EndTime            string `description:"结束时间"`
+	StartWeek          string `description:"开始日期对应周"`
+	EndWeek            string `description:"结束日期对应周"`
+	CreateTime         time.Time
+	ModifyTime         time.Time
+	Status             int       `description:"状态:1:待接受,2:已接受,3:已拒绝,4:已删除,5:已撤回,6:已结束"`
+	DeleteReason       string    `description:"删除理由"`
+	DeleteTime         time.Time `description:"删除时间"`
 }
 
 // 添加 RsActivitySeller
@@ -90,22 +89,23 @@ func AddRsActivitySeller(item *RsActivitySeller) (lastId int64, err error) {
 }
 
 type RsActivitySellerResp struct {
-	RsActivitySellerId int    `orm:"column(rs_activity_seller_id);pk"`
-	CompanyId          int    `description:"客户id"`
-	CompanyName        string `description:"客户名称"`
-	RsActivityId       int    `description:"活动id"`
-	ActivityType       string `description:"活动类型"`
-	SellerName         string `description:"销售姓名"`
-	StartDate          string `description:"开始日期"`
-	EndDate            string `description:"结束日期"`
-	StartTime          string `description:"开始时间"`
-	EndTime            string `description:"结束时间"`
-	StartWeek          string `description:"开始日期对应周"`
-	EndWeek            string `description:"结束日期对应周"`
-	Theme              string `description:"会议主题"`
-	CreateTime         string `description:"创建时间"`
-	SysUserRealName    string `description:"创建人名称"`
-	RoadshowType       string `description:"路演形式"`
+	RsActivitySellerId     int    `orm:"column(rs_activity_seller_id);pk"`
+	CompanyId              int    `description:"客户id"`
+	CompanyName            string `description:"客户名称"`
+	RsActivityId           int    `description:"活动id"`
+	ActivityType           string `description:"活动类型"`
+	SellerName             string `description:"销售姓名"`
+	StartDate              string `description:"开始日期"`
+	EndDate                string `description:"结束日期"`
+	StartTime              string `description:"开始时间"`
+	EndTime                string `description:"结束时间"`
+	StartWeek              string `description:"开始日期对应周"`
+	EndWeek                string `description:"结束日期对应周"`
+	Theme                  string `description:"会议主题"`
+	CreateTime             string `description:"创建时间"`
+	SysUserRealName        string `description:"创建人名称"`
+	RoadshowType           string `description:"路演形式"`
+	RsCalendarResearcherId int    `description:"活动研究员id（映射供前端使用）"`
 }
 
 type RsActivitySellerListResp struct {