Browse Source

no message

zhangchuanxing 3 weeks ago
parent
commit
376faa4963
2 changed files with 17 additions and 15 deletions
  1. 1 0
      controllers/roadshow/activity.go
  2. 16 15
      models/roadshow/activity.go

+ 1 - 0
controllers/roadshow/activity.go

@@ -294,6 +294,7 @@ 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 {

+ 16 - 15
models/roadshow/activity.go

@@ -64,21 +64,22 @@ 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:"删除时间"`
+	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(映射供前端使用)"`
 }
 
 // 添加 RsActivitySeller