Merge branch 'crm/crm_17.0_ficc' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/calendar.go

@@ -3079,9 +3079,24 @@ func (this *CalendarController) SellerCalendarDetail() {
 		matterList = make([]*roadshow.RsMatters, 0)
 	}
 
+	// 活动
+	condition = ` AND b.sys_user_id = ? 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)
+	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 = "获取成功"

models/roadshow/activity.go

@@ -125,6 +125,28 @@ func GetRsActivitySellerList(condition string, pars []interface{}, startSize, pa
 	return
 }
 
+func GetRsActivitySellerList2(condition string, pars []interface{}) (list []*RsActivitySellerResp, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			a.*,
+			b.sys_user_real_name,
+			b.theme,
+			b.activity_type,
+			b.company_id,
+			b.company_name 
+		FROM
+			rs_activity_seller AS a
+			INNER JOIN rs_activity AS b ON a.rs_activity_id = b.rs_activity_id 
+		WHERE
+			1 = 1`
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY a.create_time DESC `
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+	return
+}
+
 // 根据活动ID获取销售列表
 func GetRsActivitySellerListByActivityIds(rsActivityIds []int) (items []*RsActivitySeller, err error) {
 	lenArr := len(rsActivityIds)

models/roadshow/calendar.go

@@ -558,6 +558,7 @@ func GetRsMattersList(startDate, endDate string, researcherId int) (list []*RsMa
 type CalendarDetailResp struct {
 	CalendarList  []*CalendarListView
 	RsMattersList []*RsMatters
+	RsSellerList  []*RsActivitySellerResp
 }
 
 type EditActivityReq struct {