Merge branch 'crm_16.0' of http://8.136.199.33:3000/hongze/hongze_mobile_admin into debug

controllers/roadshow/calendar.go

@@ -65,7 +65,7 @@ func (this *CalendarController) Add() {
 	researcherMap := make(map[int]string)
 	var checkIsAdd []string
 
-	sysUserList, err := cygx.GetAskEmailList()
+	sysUserList, err := cygx.GetAskEmailListResearcher()
 	if err != nil {
 		this.FailWithMessage("获取失败!", "获取失败,GetAskEmailList Err:"+err.Error())
 		return
@@ -75,16 +75,6 @@ func (this *CalendarController) Add() {
 		raiAskadminMap[v.AdminId] = true
 	}
 
-	sysUserFwang, e := admin.GetSysUserByAdminName("fwang") // 手动拼接王芳到权益的策略行业下 start
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			this.FailWithMessage("用户不存在, 请检查！", "用户不存在, 请检查！")
-			return
-		}
-		this.FailWithMessage("用户不存在, 请检查！", "fwang 用户名获取用户失败！Err: "+e.Error())
-		return
-	}
-	raiAskadminMap[sysUserFwang.AdminId] = true // 手动拼接王芳到权益的策略行业下 end
 	//var tipMsg string
 	for _, v := range req.ResearcherList {
 		if v.ResearcherId <= 0 {
@@ -1461,7 +1451,7 @@ func (this *CalendarController) Edit() {
 	for _, ev := range existList {
 		existResearcherMap[ev.ResearcherId] = ev.ResearcherName
 	}
-	sysUserList, err := cygx.GetAskEmailList()
+	sysUserList, err := cygx.GetAskEmailListResearcher()
 	if err != nil {
 		this.FailWithMessage("获取失败!", "获取失败,GetAskEmailList Err:"+err.Error())
 		return
@@ -1698,7 +1688,7 @@ func (this *CalendarController) ResearcherList() {
 	for _, v := range sysUserList {
 		adminMap[v.AdminId] = v
 	}
-	askUserList, err := cygx.GetAskEmailList()
+	askUserList, err := cygx.GetAskEmailListResearcher()
 	if err != nil {
 		this.FailWithMessage("获取失败!", "获取失败,GetAskEmailList Err:"+err.Error())
 		return
@@ -1713,24 +1703,6 @@ func (this *CalendarController) ResearcherList() {
 	for _, v := range listPermission {
 		mapPermissionId[v.PermissionName] = v.ChartPermissionId
 	}
-
-	sysUserFwang, e := admin.GetSysUserByAdminName("fwang") // 手动拼接王芳到权益的策略行业下 start
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			this.FailWithMessage("用户不存在, 请检查！", "用户不存在, 请检查！")
-			return
-		}
-		this.FailWithMessage("用户不存在, 请检查！", "fwang 用户名获取用户失败！Err: "+e.Error())
-		return
-	}
-	itemFwang := new(roadshow.ResearcherGroup)
-	itemFwang.AdminId = sysUserFwang.AdminId
-	itemFwang.GroupId = sysUserFwang.GroupId
-	itemFwang.GroupName = sysUserFwang.GroupName
-	itemFwang.RealName = sysUserFwang.RealName
-	itemFwang.RoleTypeCode = sysUserFwang.RoleTypeCode
-	mapPermissionUser["策略"] = append(mapPermissionUser["策略"], itemFwang) // 手动拼接王芳到权益的策略行业下 end
-
 	for _, v := range askUserList {
 		if admin, ok := adminMap[v.AdminId]; ok {
 			item := &roadshow.ResearcherGroup{
@@ -2160,8 +2132,7 @@ func (this *CalendarController) MyCalendarDetail() {
 	if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_RESEARCHR ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_RESEARCHR ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_RESEARCHR ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER {
+		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
 		condition += ` AND b.researcher_id=?`
 		pars = append(pars, sysUser.AdminId)
 
@@ -2195,6 +2166,58 @@ func (this *CalendarController) MyCalendarDetail() {
 		return
 	}
 
+	if calendarList == nil {
+		calendarList = make([]*roadshow.CalendarListView, 0)
+	} else {
+		var sysUserIds []int             //建会人ID
+		var companyIds []int             //公司ID
+		for _, v := range calendarList { //上海同步过来信息展示逻辑替换 需求池 953
+			if v.Source == 1 && v.CompanyName == "" {
+				v.CompanyName = v.Title
+			}
+			if v.SysUserId > 0 {
+				sysUserIds = append(sysUserIds, v.SysUserId)
+			}
+			if v.CompanyId > 1 {
+				companyIds = append(companyIds, v.CompanyId)
+			}
+		}
+
+		//如果是权益销售建的会，客户状态替换成权益那边的
+		mapSellRai := make(map[int]bool)  // 是否是权益销售
+		mapStatus := make(map[int]string) //权益客户对应的状态
+		if len(sysUserIds) > 0 && len(companyIds) > 0 {
+			//判断哪些人是权益销售
+			adminList, err := admin.GetAdminListByIdListWithoutEnable(sysUserIds)
+			if err != nil {
+				this.FailWithMessage("获取数据失败!", "获取数据失败，GetAdminListByIdListWithoutEnable Err:"+err.Error())
+				return
+			}
+			for _, v := range adminList {
+				if v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
+					mapSellRai[v.AdminId] = true
+				}
+			}
+
+			conditionProduct := `  AND company_id  IN (` + utils.GetOrmInReplace(len(companyIds)) + `) AND  product_id = 2 `
+			parsProduct := make([]interface{}, 0)
+			parsProduct = append(parsProduct, companyIds)
+			productList, err := company_product.GetCompanyProductList(conditionProduct, parsProduct)
+			if err != nil {
+				this.FailWithMessage("获取数据失败!", "获取数据失败，GetCompanyProductList Err:"+err.Error())
+				return
+			}
+			for _, v := range productList {
+				mapStatus[v.CompanyId] = v.Status
+			}
+		}
+		for _, v := range calendarList {
+			if mapSellRai[v.SysUserId] && mapStatus[v.CompanyId] != "" {
+				v.CompanyStatus = mapStatus[v.CompanyId]
+			}
+		}
+	}
+
 	matterList, err := roadshow.GetRsMattersList(startDate, endDate, sysUser.AdminId)
 	if err != nil {
 		this.FailWithMessage("获取数据失败!", "获取数据失败，GetRsMattersList Err:"+err.Error())

models/cygx/activity_ask_email.go

@@ -26,9 +26,17 @@ func GetAskEmailList() (item []*AskEmailRep, err error) {
 	return
 }
 
+// 权益自定义研究员信息
+func GetAskEmailListResearcher() (item []*AskEmailRep, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT * FROM cygx_activity_ask_email WHERE  chart_permission_name != ''  AND enabled_researcher = 1 AND admin_id > 0    ORDER BY sort  DESC , id ASC  `
+	_, err = o.Raw(sql).QueryRows(&item)
+	return
+}
+
 func UpdateAskEmail(item *AskEmailRep) (err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_activity_ask_email SET admin_id=? where mobile=?`
-	_, err = o.Raw(sql,item.AdminId,item.Mobile).Exec()
+	_, err = o.Raw(sql, item.AdminId, item.Mobile).Exec()
 	return
-}
+}