Merge branch 'crm_16.6_ficc' of http://8.136.199.33:3000/hongze/hongze_task into crm_16.6_ficc

models/roadshow/report.go

@@ -81,6 +81,8 @@ type RsCalendarResearcherView struct {
 	IsSynced               int       `description:"是否与上海同步 0:未同步 1:已同步"`
 	ResearcherSort         int       `description:"研究员新增排序"`
 	QuestionStatus         int       `description:"问答状态：0-未填写；1-已填写"`
+	EnglishCompany         int       `description:"是否为英文客户: 0-否; 1-是"`
+	CompanyStatus          string    `description:"客户状态:'试用','永续','冻结','流失','正式','潜在'"`
 }
 
 func GetRsCalendarDetail(endDate string) (list []*RsCalendarResearcherView, err error) {

services/roadshow/report.go

@@ -172,15 +172,21 @@ func AddReportRecord(cont context.Context) (err error) {
 		}
 		company := new(roadshow.CompanySearchView)
 		if v.CompanyId > 0 {
-			if mapRaiSllerId[v.SysUserId] {
-				company, _ = companyMapRai[v.CompanyId] // 如果是权益销售添加的信息，就用权益相关的客户信息
-				if len(mapPermissionNameRai[v.CompanyId]) > 0 {
-					company.PermissionName = strings.Join(mapPermissionNameRai[v.CompanyId], "/")
-				}
+			if v.EnglishCompany == 1 { //如果是海外客户公司信息就直接拿存在海外的客户数据
+				company.CompanyId = v.CompanyId
+				company.CompanyName = v.CompanyName
+				company.Status = v.CompanyStatus
 			} else {
-				company, _ = companyMap[v.CompanyId]
-				if len(mapPermissionNameFicc[v.CompanyId]) > 0 {
-					company.PermissionName = strings.Join(mapPermissionNameFicc[v.CompanyId], "/")
+				if mapRaiSllerId[v.SysUserId] {
+					company, _ = companyMapRai[v.CompanyId] // 如果是权益销售添加的信息，就用权益相关的客户信息
+					if len(mapPermissionNameRai[v.CompanyId]) > 0 {
+						company.PermissionName = strings.Join(mapPermissionNameRai[v.CompanyId], "/")
+					}
+				} else {
+					company, _ = companyMap[v.CompanyId]
+					if len(mapPermissionNameFicc[v.CompanyId]) > 0 {
+						company.PermissionName = strings.Join(mapPermissionNameFicc[v.CompanyId], "/")
+					}
 				}
 			}
 		}