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

controllers/roadshow/activity.go

@@ -223,7 +223,7 @@ func (this *ActivityController) Add() {
 // @Param   PageSize   query   int  true       "每页数据条数"
 // @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Success 200 {object} roadshow.ResearcherGroup
-// @router /list [get]
+// @router /list2 [get]
 func (this *ActivityController) List() {
 	br := new(models.BaseResponse).Init()
 	defer func() {

controllers/roadshow/calendar.go

@@ -1237,7 +1237,7 @@ func (this *CalendarController) CalendarList() {
 		br.Ret = 408
 		return
 	}
-
+	resp := new(roadshow.CalendarListResp)
 	calendarType, _ := this.GetInt("CalendarType")
 
 	pageSize, _ := this.GetInt("PageSize")
@@ -1263,6 +1263,72 @@ func (this *CalendarController) CalendarList() {
 	var condition string
 	var pars []interface{}
 
+	if calendarType == 6 { // 兼容前端 单独走一条逻辑
+		condition = " AND b.sys_user_id = ?  AND a.status = 2  "
+		pars = append(pars, sysUser.AdminId)
+
+		total, err := roadshow.GetRsActivitySellerListCount(condition, pars)
+		if err != nil {
+			br.Msg = "获取失败！"
+			br.ErrMsg = "获取数量失败！Err:" + err.Error()
+			return
+		}
+		page = paging.GetPaging(currentIndex, pageSize, total)
+
+		dataList, err := roadshow.GetRsActivitySellerList(condition, pars, startSize, pageSize)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取数据失败,GetRsActivitySellerList,Err:" + err.Error()
+			return
+		}
+		if len(dataList) > 0 {
+			var rsActivityIds []int
+			for _, v := range dataList {
+				rsActivityIds = append(rsActivityIds, v.RsActivityId)
+			}
+			//获取对应的多个销售信息
+			listSeller, err := roadshow.GetRsActivitySellerListByActivityIds(rsActivityIds)
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取数据失败,GetRsActivitySellerList,Err:" + err.Error()
+				return
+			}
+			mapSeller := make(map[int][]string)
+			for _, v := range listSeller {
+				mapSeller[v.RsActivityId] = append(mapSeller[v.RsActivityId], v.SellerName)
+			}
+			for _, v := range dataList {
+				v.SellerName = strings.Join(mapSeller[v.RsActivityId], ",")
+				item := new(roadshow.CalendarListView)
+				item.Status = 2
+				item.CompanyId = v.CompanyId
+				item.CompanyName = v.CompanyName
+				item.RsActivityId = v.RsActivityId
+				item.ActivityType = v.ActivityType
+				item.ResearcherName = v.SellerName
+				item.StartDate = v.StartDate
+				item.EndDate = v.EndDate
+				item.StartTime = v.StartTime
+				item.EndTime = v.EndTime
+				item.StartWeek = v.StartWeek
+				item.EndWeek = v.EndWeek
+				item.Theme = v.Theme
+				item.CreateTime = v.CreateTime
+				item.SysUserRealName = v.SysUserRealName
+				resp.List = append(resp.List, item)
+			}
+		} else {
+			resp.List = make([]*roadshow.CalendarListView, 0)
+		}
+
+		resp.Paging = page
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
+
 	roleTypeCode := sysUser.RoleTypeCode
 	//销售
 	if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER ||
@@ -1348,7 +1414,7 @@ func (this *CalendarController) CalendarList() {
 	}
 
 	fmt.Println(condition)
-	resp := new(roadshow.CalendarListResp)
+
 	total, err := roadshow.GetCalendarListCount(condition, pars, calendarType)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取信息失败"

models/roadshow/calendar.go

@@ -315,6 +315,7 @@ type CalendarListView struct {
 	CompanyClassify        string `description:"客户分类"`
 	QuestionStatus         int    `description:"问答状态：0-未填写；1-已填写"`
 	QuestionMsgStatus      int    `description:"问答模板消息：0-未发送；1-已发送"`
+	RsActivityId           int    `description:"活动id"`
 }
 
 type CalendarListResp struct {

routers/commentsRouter.go

@@ -7678,7 +7678,7 @@ func init() {
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:ActivityController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:ActivityController"],
         beego.ControllerComments{
             Method: "List",
-            Router: `/list`,
+            Router: `/list2`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,