no message

controllers/cygx/activity_signup.go

@@ -2476,6 +2476,13 @@ func (this *ActivitySignupCoAntroller) SummaryList() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+	//根据公司ID获取对应销售
+	var sellerCompanyIds []int
+	for _, v := range list {
+		sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
+	}
+	sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
+
 	total, errtotal := cygx.GetCygxAppointmentSummaryCount(activityId, totalStr)
 	if errtotal != nil {
 		br.Msg = "获取失败"
@@ -2489,7 +2496,7 @@ func (this *ActivitySignupCoAntroller) SummaryList() {
 		return
 	}
 	for k, v := range list {
-		list[k].SellerName = v.PsellerName
+		list[k].SellerName = sellNameMap[v.CompanyId]
 		if !isShowMobile {
 			list[k].Mobile = ""
 		}
@@ -2760,11 +2767,34 @@ func (this *ActivitySignupCoAntroller) ReminderList() {
 		return
 	}
 	//根据公司ID获取对应销售
-	var sellerCompanyIds []int
+	//var sellerCompanyIds []int
+	var userIds []int
 	for _, v := range list {
-		sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
+		//sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
+		userIds = append(userIds, v.UserId)
 	}
-	sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
+
+	listUser, err := models.GetWxUserRaiSllerListByUserIds(userIds)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+	//拼接用户相关信息
+	mapUser := make(map[int]*models.WxUserSller)
+	for _, v := range listUser {
+		mapUser[v.UserId] = v
+	}
+	for _, v := range list {
+		if mapUser[v.UserId] != nil {
+			v.RealName = mapUser[v.UserId].RealName
+			v.Mobile = mapUser[v.UserId].Mobile
+			v.CompanyName = mapUser[v.UserId].CompanyName
+			v.SellerName = mapUser[v.UserId].SellerName
+		}
+	}
+
+	//sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
 	total, errtotal := cygx.GetCygxActivityMeetingReminderCount(activityId, totalStr)
 	if errtotal != nil {
 		br.Msg = "获取失败"
@@ -2778,9 +2808,9 @@ func (this *ActivitySignupCoAntroller) ReminderList() {
 		return
 	}
 	if len(list) > 0 {
-		for k, v := range list {
-			list[k].SellerName = sellNameMap[v.CompanyId]
-		}
+		//for k, v := range list {
+		//	list[k].SellerName = sellNameMap[v.CompanyId]
+		//}
 	} else {
 		list = make([]*cygx.CygxAppointmentList, 0)
 	}

controllers/cygx/user.go

@@ -2987,7 +2987,7 @@ func (this *UserController) CompanyList() {
 		br.ErrMsg = "获取公司ID数据失败，Err:" + err.Error()
 		return
 	}
-	condition = ` AND r.company_id  IN  (   ` + companyCondition + `  )AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
+	condition = ` AND r.company_id  IN  (   ` + companyIds + `  )AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
 	if keyWord != "" {
 		condition += ` AND  (r.mobile LIKE '%` + keyWord + `%' OR r.email LIKE '%` + keyWord + `%' OR r.real_name LIKE '%` + keyWord + `%'` + ` OR r.company_name LIKE '%` + keyWord + `%') `
 	}
@@ -3046,6 +3046,7 @@ func (this *UserController) CompanyList() {
 			var articleIds string
 			mapAricleId := make(map[int]int)
 			mapAricleIndustrialSubjectName := make(map[int]*cygx.ArticleIndustrialSubjectNameResp)
+			var sellerCompanyIds []int
 			for k, v := range list {
 				if v.ArticleId >= utils.SummaryArticleId {
 					list[k].ArticleType = 1
@@ -3060,7 +3061,10 @@ func (this *UserController) CompanyList() {
 					mapAricleId[v.ArticleId] = v.ArticleId
 				}
 				list[k].RegisterPlatform = cygxService.GetArticleSourcePlatform(v.SourcePlatform)
+				sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
 			}
+
+			sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
 			articleIds = strings.TrimRight(articleIds, ",")
 			if articleIds != "" {
 				listArticleIndustrialSubjectList, err := cygx.GetCygxArticleIndustrialSubjectName(articleIds)
@@ -3078,6 +3082,7 @@ func (this *UserController) CompanyList() {
 							list[k].IndustryName = mapAricleIndustrialSubjectName[v.ArticleId].IndustryName
 							list[k].SubjectNameStr = mapAricleIndustrialSubjectName[v.ArticleId].SubjectNameStr
 						}
+						list[k].SellerName = sellNameMap[v.CompanyId]
 					}
 				}
 			}
@@ -3122,6 +3127,13 @@ func (this *UserController) CompanyList() {
 			br.Msg = "获取参会人数列表失败"
 			return
 		}
+		//根据公司ID获取对应销售
+		var sellerCompanyIds []int
+		for _, v := range list {
+			sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
+		}
+		sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
+
 		if len(list) > 0 {
 			for k, v := range list {
 				if v.ActivityType == 1 {
@@ -3138,6 +3150,7 @@ func (this *UserController) CompanyList() {
 					list[k].FirstMeetingTime = ""
 					list[k].LastMeetingTime = ""
 				}
+				v.SellerName = sellNameMap[v.CompanyId]
 			}
 		}
 	} else if source == 3 {
@@ -3153,6 +3166,13 @@ func (this *UserController) CompanyList() {
 			br.ErrMsg = "获取用户搜藏记录失败，Err:" + err.Error()
 			return
 		}
+		//根据公司ID获取对应销售
+		var sellerCompanyIds []int
+		for _, v := range list {
+			sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
+		}
+		sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
+
 		if len(list) > 0 {
 			for k, v := range list {
 				if v.ArticleId >= utils.SummaryArticleId {
@@ -3160,6 +3180,7 @@ func (this *UserController) CompanyList() {
 				} else {
 					list[k].ArticleType = 2
 				}
+				v.SellerName = sellNameMap[v.CompanyId]
 			}
 		}
 	} else if source == 4 {
@@ -3227,6 +3248,16 @@ func (this *UserController) CompanyList() {
 			br.Msg = "获取用户关注总数失败"
 			return
 		}
+		//根据公司ID获取对应销售
+		var sellerCompanyIds []int
+		for _, v := range list {
+			sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
+		}
+		sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
+		for _, v := range list {
+			v.SellerName = sellNameMap[v.CompanyId]
+		}
+
 	} else if source == 6 {
 		total, err = cygx.GetCygArticleDepartmentFollowCountByCompany(condition)
 		if err != nil {
@@ -3241,7 +3272,15 @@ func (this *UserController) CompanyList() {
 			return
 		}
 		if len(list) > 0 {
+			//根据公司ID获取对应销售
+			var sellerCompanyIds []int
+			for _, v := range list {
+				sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
+			}
+			sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
+
 			for k, v := range list {
+				v.SellerName = sellNameMap[v.CompanyId]
 				var conditionDepartment string
 				var pars []interface{}
 				conditionDepartment += ` WHERE art.source = 1 AND art.is_summary = 1 AND art.department_id =  ` + strconv.Itoa(v.DepartmentId)
@@ -3322,6 +3361,17 @@ func (this *UserController) CompanyList() {
 			br.ErrMsg = "获取搜索记录列表失败，Err:" + err.Error()
 			return
 		}
+
+		//根据公司ID获取对应销售
+		var sellerCompanyIds []int
+		for _, v := range list {
+			sellerCompanyIds = append(sellerCompanyIds, v.CompanyId)
+		}
+		sellNameMap := services.GetSellNameMapByCompanyIds(sellerCompanyIds)
+		for _, v := range list {
+			v.SellerName = sellNameMap[v.CompanyId]
+		}
+
 	} else if source == 10 { //标签点击记录
 		condition = ``
 		if adminId != "" {
@@ -4120,14 +4170,13 @@ func (this *UserController) TableCompanyList() {
 			}
 		}
 	}
-
 	condition += ` AND b.status IN ('正式','试用','冻结') `
-	companyCondition := `SELECT a.company_id FROM company AS a  INNER JOIN company_product AS b ON a.company_id=b.company_id   WHERE a.enabled=1  `
+	companyCondition := ` AND  a.enabled=1  `
 	if condition != "" {
 		companyCondition += condition
 	}
 
-	condition = ` AND r.company_id  IN  (   ` + companyCondition + `  )AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
+	//condition = ` AND r.company_id  IN  (   ` + companyCondition + `  )AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
 
 	//historyNum, err := cygx.GetCygxArticleHistoryCountByCompany(condition)
 	//if err != nil {
@@ -4142,6 +4191,22 @@ func (this *UserController) TableCompanyList() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
+	var pars []interface{}
+
+	lsitCompany, err := company.GetCompanyProductListBycondition(condition, pars)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，GetCompanyProductListBycondition Err:" + err.Error()
+		return
+	}
+
+	var companyIds []string
+	for _, v := range lsitCompany {
+		companyIds = append(companyIds, strconv.Itoa(v.CompanyId))
+	}
+	condition = " AND  r.company_id IN (" + strings.Join(companyIds, ",") + ")"
+	condition += `  AND r.create_time < date_format(now(),'%Y-%m-%d') ` //过滤当天时间
+
 	historyNum, _ := strconv.Atoi(detailConfig.ConfigValue)
 	//获取参会总数
 	activityNum, err := cygx.GetActivityMeetByCompanyCount(condition)
@@ -4199,7 +4264,7 @@ func (this *UserController) TableCompanyList() {
 		br.ErrMsg = "获取搜索记录失败，Err:" + err.Error()
 		return
 	}
-	tagNum, err := cygx.GetCygxTagHistoryCountByCompanyIds(companyCondition, "")
+	tagNum, err := cygx.GetCygxTagHistoryCountByCompanyIds(strings.Join(companyIds, ","), "")
 	if err != nil {
 		br.ErrMsg = "获取信息失败，Err:" + err.Error()
 		br.Msg = "获取搜索记录失败"

models/company/company_product.go

@@ -570,3 +570,14 @@ func GetCompanyProductList(condition string, pars []interface{}) (items []*Compa
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// 获取列表
+func GetCompanyProductListBycondition(condition string, pars []interface{}) (items []*CompanyProduct, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT a.company_id FROM company AS a  INNER JOIN company_product AS b ON a.company_id=b.company_id   WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}

models/cygx/chart.go

@@ -275,9 +275,8 @@ func GetChartCollectList(condition string) (items []*UserInteraction, err error)
 	//		WHERE 1= 1 ` + condition + `   GROUP BY r.mobile  ORDER BY ui.chart_count_num DESC `
 	//_, err = o.Raw(sql).QueryRows(&items)
 
-	o := orm.NewOrm()
-	sql := `SELECT u.mobile,u.user_id,u.real_name FROM cygx_chart_collect AS r
-			INNER JOIN wx_user AS u ON u.mobile = r.mobile
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT  *  FROM cygx_chart_collect AS r
 			WHERE 1= 1 ` + condition + `   GROUP BY r.mobile `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -285,7 +284,7 @@ func GetChartCollectList(condition string) (items []*UserInteraction, err error)
 
 // 获取图表列表
 func GetChartCollectBycompanyList(condition string, startSize, pageSize int) (items []*UserInteraction, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	//sql := `SELECT u.mobile,u.user_id,u.real_name,r.company_name,
 	//		cp.seller_name FROM cygx_chart_collect AS r
 	//		INNER JOIN wx_user AS u ON u.user_id = r.user_id
@@ -294,10 +293,8 @@ func GetChartCollectBycompanyList(condition string, startSize, pageSize int) (it
 	//		INNER JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
 	//		WHERE 1= 1 ` + condition + `   GROUP BY r.mobile  ORDER BY ci.chart_count_num DESC , ui.chart_count_num DESC `
 
-	sql := `SELECT u.mobile,u.user_id,u.real_name,r.company_name,
-			cp.seller_name FROM cygx_chart_collect AS r
-			INNER JOIN wx_user AS u ON u.user_id = r.user_id
-			LEFT JOIN company_product AS cp ON cp.company_id = r.company_id AND cp.product_id = 2
+	sql := `SELECT r.*
+			FROM cygx_chart_collect AS r
 			WHERE 1= 1 ` + condition + `   GROUP BY r.mobile   `
 	if startSize > 0 || pageSize > 0 {
 		sql += ` LIMIT ` + strconv.Itoa(startSize) + "," + strconv.Itoa(pageSize)
@@ -319,7 +316,7 @@ func GetChartCountByUserCount(condition string) (count int, err error) {
 				cygx_chart_collect AS r
 				INNER JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 				INNER JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id 
-				WHERE 1= 1 ` + condition + ` GROUP BY u.user_id ) AS count`
+				WHERE 1= 1 ` + condition + ` GROUP BY r.user_id ) AS count`
 	err = o.Raw(sql).QueryRow(&count)
 	return
 }

models/cygx/cygx_user.go

@@ -353,6 +353,7 @@ type UserInteraction struct {
 	ChartId               int    `description:"图表id"`
 	RealName              string `description:"姓名"`
 	CompanyName           string `description:"公司名称"`
+	CompanyId             int    `description:"公司ID"`
 	SellerName            string `description:"所属销售"`
 	Mobile                string `description:"手机号"`
 	UserId                int    `description:"用户ID"`
@@ -905,7 +906,7 @@ type GetUserInteractionTableCountResp struct {
 func GetUserInteractionTableCount(uid int) (item *GetUserInteractionTableCountResp, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h  INNER JOIN cygx_article  as art  ON  art.article_id = h.article_id  WHERE h.user_id = ? ) AS history_num,
+			( SELECT COUNT( 1 ) FROM cygx_article_history_record_all AS h  INNER JOIN cygx_article  as art  ON  art.article_id = h.article_id  WHERE h.user_id = ?  AND h.is_del = 0 ) AS history_num,
 			( SELECT COUNT( 1 ) FROM cygx_article_collect AS h WHERE h.user_id = ? AND  h.article_id > 0  ) AS count_num,
 			( SELECT COUNT( 1 ) FROM cygx_chart_collect AS h INNER JOIN cygx_chart_all AS a ON h.chart_id = a.chart_id WHERE h.user_id = ?  ) AS chart_num,
 			( SELECT COUNT( 1 ) FROM cygx_industry_fllow AS h WHERE h.user_id = ? AND h.type = 1  ) AS industry_fllow_num,

models/cygx/cygx_user_company.go

@@ -409,7 +409,7 @@ func GetCygxRoadshowByCompanyList(condition string, startSize, pageSize int) (it
 			r.real_name,
 			r.mobile,
 			r.company_name,
-			cp.seller_name,
+			r.company_id,
 			ci.roadshow_num,
 			ui.roadshow_num AS ui_roadshow_num,
 			"逻辑解析" AS file_type 
@@ -425,7 +425,7 @@ func GetCygxRoadshowByCompanyList(condition string, startSize, pageSize int) (it
 			r.real_name,
 			r.mobile,
 			r.company_name,
-			cp.seller_name,
+			r.company_id,
 			ci.roadshow_num,
 			ui.roadshow_num AS ui_roadshow_num,
 			"路演回放" AS file_type 
@@ -441,7 +441,7 @@ func GetCygxRoadshowByCompanyList(condition string, startSize, pageSize int) (it
 			r.real_name,
 			r.mobile,
 			r.company_name,
-			cp.seller_name,
+			r.company_id,
 			ci.roadshow_num,
 			ui.roadshow_num AS ui_roadshow_num,
 			"路演回放" AS file_type 
@@ -513,7 +513,7 @@ func GetCygxArticleHistoryRecordByCompanyList(condition string, startSize, pageS
 			r.mobile,
 			r.user_id,
 			r.company_name,
-			cp.seller_name,
+			r.company_id,
 			r.real_name,
 			r.stop_time,
 			r.source as source_platform,
@@ -553,7 +553,6 @@ func GetActivityMeetByCompanyList(condition string, startSize, pageSize int) (it
 			r.meeting_authentication,
 			r.meeting_status_str,
 			r.company_name,
-			cp.seller_name,
 			r.real_name,
 			r.duration
 		FROM
@@ -594,7 +593,7 @@ func GetCygxArticleCollectByCompanyList(startSize, pageSize int, condition strin
 			r.real_name,
 			re.match_type_name,
 			r.company_name,
-			cp.seller_name,
+			r.company_id,
 			(
 			SELECT
 				GROUP_CONCAT( DISTINCT s.subject_name SEPARATOR '/' ) 
@@ -636,14 +635,15 @@ func GetCygxIndustryFllowByCompanyList(condition string, startSize, pageSize int
 			r.mobile,
 			r.real_name,
 			r.modify_time as create_time,
-			cp.company_name,
-			cp.seller_name,
+			r.company_name,
+			r.company_id,
+
 			( SELECT GROUP_CONCAT( DISTINCT s.subject_name SEPARATOR '/' ) FROM cygx_industrial_subject AS s WHERE s.industrial_management_id = m.industrial_management_id ) AS subject_name_str 
 		FROM
 			cygx_industry_fllow AS r
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = r.industrial_management_id
 			LEFT JOIN cygx_company_interaction_num AS ci ON ci.company_id = r.company_id
-			LEFT  JOIN cygx_user_interaction_num as ui  ON ui.user_id = u.user_id
+			LEFT  JOIN cygx_user_interaction_num as ui  ON ui.user_id = r.user_id
 			
 		WHERE  type = 1 ` + condition + ` ORDER BY ci.industry_fllow_num DESC,ui.industry_fllow_num DESC, r.create_time DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
@@ -659,8 +659,8 @@ func GetCygArticleDepartmentFollowByCompanyList(condition string, startSize, pag
 			r.modify_time as  create_time,
 			r.mobile,
 			r.real_name,
-			cp.company_name,
-			cp.seller_name,
+			r.company_name,
+			r.company_id,
 			m.department_id,
 			i.industry_name,
 			a.title,
@@ -688,7 +688,6 @@ func GetCygxSearchKeyWordByCompanyList(condition string, startSize, pageSize int
 	sql := `SELECT
 			r.key_word,r.create_time,
 			r.mobile,
-			r.source,
 			r.company_name,
 			r.real_name
 		FROM