no message

controllers/roadshow/calendar.go

@@ -2778,9 +2778,24 @@ func (this *CalendarController) MyCalendarDetail() {
 		return
 	}
 
+	// 活动
+	condition = ` AND a.seller_id  IN (?) AND a.start_date >= ? AND a.end_date <= ? AND a.status = 2 `
+	pars = make([]interface{}, 0)
+	pars = append(pars, sysUser.AdminId, startDate, endDate)
+	sellerList, err := roadshow.GetRsActivitySellerList2(condition, pars)
+	if err != nil {
+		br.Msg = "获取数据失败"
+		br.ErrMsg = "获取数据失败，GetCalendarDetailList Err:" + err.Error()
+		return
+	}
+	if sellerList == nil {
+		sellerList = make([]*roadshow.RsActivitySellerResp, 0)
+	}
+
 	resp := new(roadshow.CalendarDetailResp)
 	resp.CalendarList = calendarList
 	resp.RsMattersList = matterList
+	resp.RsSellerList = sellerList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -3036,17 +3051,19 @@ func (this *CalendarController) SellerCalendarDetail() {
 	}
 	startDate := this.GetString("StartDate")
 	endDate := this.GetString("EndDate")
-	sellerId, _ := this.GetInt("SellerId")
+	sellerId := this.GetString("SellerId")
 	if startDate == "" || endDate == "" {
 		br.Msg = "参数错误"
 		return
 	}
-	if sellerId <= 0 {
+	if sellerId == "" {
 		calendarList := make([]*roadshow.CalendarListView, 0)
 		matterList := make([]*roadshow.RsMatters, 0)
+		sellerList := make([]*roadshow.RsActivitySellerResp, 0)
 		resp := new(roadshow.CalendarDetailResp)
 		resp.CalendarList = calendarList
 		resp.RsMattersList = matterList
+		resp.RsSellerList = sellerList
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
@@ -3055,7 +3072,7 @@ func (this *CalendarController) SellerCalendarDetail() {
 	}
 
 	// 路演
-	condition := ` AND a.sys_user_id = ? AND b.start_date >= ? AND b.end_date <= ? AND b.status = 2`
+	condition := ` AND a.sys_user_id IN (?) AND b.start_date >= ? AND b.end_date <= ? AND b.status = 2`
 	pars := make([]interface{}, 0)
 	pars = append(pars, sellerId, startDate, endDate)
 	calendarList, err := roadshow.GetCalendarDetailList(condition, pars)
@@ -3069,7 +3086,7 @@ func (this *CalendarController) SellerCalendarDetail() {
 	}
 
 	// 事项
-	matterList, err := roadshow.GetRsMattersList(startDate, endDate, sellerId)
+	matterList, err := roadshow.GetRsMattersListBySysUserId(startDate, endDate, sellerId)
 	if err != nil {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "获取数据失败，GetRsMattersList Err:" + err.Error()
@@ -3080,7 +3097,7 @@ func (this *CalendarController) SellerCalendarDetail() {
 	}
 
 	// 活动
-	condition = ` AND b.sys_user_id = ? AND a.start_date >= ? AND a.end_date <= ? AND a.status = 2`
+	condition = ` AND a.seller_id  IN (?) AND a.start_date >= ? AND a.end_date <= ? AND a.status = 2 `
 	pars = make([]interface{}, 0)
 	pars = append(pars, sellerId, startDate, endDate)
 	sellerList, err := roadshow.GetRsActivitySellerList2(condition, pars)

models/roadshow/calendar.go

@@ -555,6 +555,16 @@ func GetRsMattersList(startDate, endDate string, researcherId int) (list []*RsMa
 	return
 }
 
+func GetRsMattersListBySysUserId(startDate, endDate string, researcherId string) (list []*RsMatters, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM  rs_matters AS a WHERE a.start_date>=? AND a.end_date<=? AND sys_user_id IN(?) `
+	//sql := `SELECT * FROM  rs_matters AS a WHERE sys_user_id IN(?) `
+	sql += ` ORDER BY a.create_time DESC `
+	_, err = o.Raw(sql, startDate, endDate, researcherId).QueryRows(&list)
+	//_, err = o.Raw(sql, researcherId).QueryRows(&list)
+	return
+}
+
 type CalendarDetailResp struct {
 	CalendarList  []*CalendarListView
 	RsMattersList []*RsMatters