Merge branch 'CRM_15.5' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/roadshow/calendar.go

@@ -70,6 +70,18 @@ func (this *CalendarController) Add() {
 
 	researcherMap := make(map[int]string)
 	var checkIsAdd []string
+
+	//获取所有自定义的权益研究员
+	sysUserList, err := cygx.GetAskEmailList()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,GetAskEmailList Err: " + err.Error()
+		return
+	}
+	raiAskadminMap := make(map[int]bool, 0)
+	for _, v := range sysUserList {
+		raiAskadminMap[v.AdminId] = true
+	}
 	//var tipMsg string
 	for _, v := range req.ResearcherList {
 		if v.ResearcherId <= 0 {
@@ -106,6 +118,11 @@ func (this *CalendarController) Add() {
 			return
 		}
 
+		if req.ActivityType == "沙龙" && !raiAskadminMap[v.ResearcherId] {
+			br.Msg = "ficc研究员暂不支持添加沙龙"
+			return
+		}
+
 		startDateTime := v.StartDate + " " + v.StartTime
 		endDateTime := v.EndDate + " " + v.EndTime
 
@@ -174,16 +191,6 @@ func (this *CalendarController) Add() {
 		br.IsSendEmail = false
 		return
 	}
-	sysUserList, err := cygx.GetAskEmailList()
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败,GetAskEmailList Err: " + err.Error()
-		return
-	}
-	raiAskadminMap := make(map[int]bool, 0)
-	for _, v := range sysUserList {
-		raiAskadminMap[v.AdminId] = true
-	}
 
 	rsCalendar := new(roadshow.RsCalendar)
 	rsCalendar.SysUserId = sysUser.AdminId
@@ -1180,7 +1187,7 @@ func (this *CalendarController) CalendarList() {
 	}
 	if calendarType == 2 {
 		condition += ` AND b.status>=2`
-		condition += ` AND a.activity_type IN('路演','公开会议') `
+		condition += ` AND a.activity_type IN('路演','公开会议','沙龙') `
 	}
 	if calendarType == 3 {
 		condition += ` AND a.activity_type='内部会议' `
@@ -1276,7 +1283,7 @@ func (this *CalendarController) CalendarList() {
 			}
 		}
 		//如果是已结束的权益销售添加的活动，就行进行按钮展示
-		if mapRaiSllerId[dataList[i].SysUserId] && utils.InArrayByInt([]int{2, 6}, dataList[i].Status) {
+		if mapRaiSllerId[dataList[i].SysUserId] && utils.InArrayByInt([]int{2, 6}, dataList[i].Status) && dataList[i].ActivityType != "沙龙" {
 			if mapMeetingCount[dataList[i].RsCalendarId] == 0 {
 				dataList[i].SubmitButton = true
 			} else {
@@ -2288,6 +2295,12 @@ func (this *CalendarController) ResearcherCalendarDetail() {
 
 	if calendarList == nil {
 		calendarList = make([]*roadshow.CalendarListView, 0)
+	} else {
+		for _, v := range calendarList { //上海同步过来信息展示逻辑替换 需求池 953
+			if v.Source == 1 && v.CompanyName == "" {
+				v.CompanyName = v.Title
+			}
+		}
 	}
 
 	if matterList == nil {
@@ -2488,7 +2501,7 @@ func getTitle(activityType, roadshowType, activityCategory, roadshowPlatform, pr
 	switch activityType {
 	case "内部会议":
 		title = "内部会议"
-	case "公开会议", "路演":
+	case "公开会议", "路演", "沙龙":
 		if roadshowType == "线上" {
 			title = roadshowType + activityType + roadshowPlatform
 		} else {

models/roadshow/company.go

@@ -39,7 +39,7 @@ func CompanySearchV2(sellerId, groupId int, keyWord string) (list []*CompanySear
 				company AS a
 			INNER JOIN company_product AS b ON a.company_id = b.company_id 
 			WHERE
-				b.status IN ('正式', '试用') AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND a.company_name LIKE ?
+				b.status IN ('正式', '试用', '永续') AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND a.company_name LIKE ?
 			GROUP BY
 				b.company_id `
 	_, err = o.Raw(sql, sellerId, sellerId, groupId, groupId, keyWord).QueryRows(&companies)