Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into cygx/cygx_12.8

controllers/company.go

@@ -2833,8 +2833,15 @@ func (this *CompanyController) Add() {
 			br.ErrMsg = "新增失败,ModifyCompanyUserCompanyId err:" + err.Error()
 			return
 		}
+		//获取联系人详情
+		userInfo, err := models.GetWxUserByUserId(req.UserId)
+		if err != nil {
+			br.Msg = "获取联系人异常！"
+			br.ErrMsg = "获取联系人异常，Err:" + err.Error()
+			return
+		}
 		//添加该联系人 与 当前销售的关系
-		models.AddUserSellerRelation(int64(req.UserId), int(companyId), seller.AdminId, productId, seller.RealName, "", "")
+		models.AddUserSellerRelation(int64(req.UserId), int(companyId), seller.AdminId, productId, seller.RealName, userInfo.Mobile, userInfo.Email)
 	}
 
 	companyProduct := new(company.CompanyProduct)

controllers/cygx/activity_video.go

@@ -493,9 +493,9 @@ func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
 	}
 	//类型 1 路演反馈 ，2：调研反馈
 	if searchType == 1 {
-		condition += ` AND art.activity_type_id IN (2,7)   AND  art.is_yidong_conduct = 1 `
+		condition += ` AND v.file_type = 1 `
 	} else if searchType == 2 {
-		condition += ` AND  (	  art.activity_type_id NOT IN (2,7)  OR  art.is_yidong_conduct = 0)  `
+		condition += ` AND v.file_type = 2   `
 	}
 
 	var conditionOrder string

controllers/cygx/report_article.go

@@ -13,6 +13,7 @@ import (
 	"hongze/hz_crm_api/services"
 	cygxService "hongze/hz_crm_api/services/cygx"
 	"hongze/hz_crm_api/utils"
+	"html"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -1002,6 +1003,11 @@ func (this *ReportArticleController) Detail() {
 			articleInfo.ChartPermissionId, _ = strconv.Atoi(chartPermissionIdArr[0])
 		}
 	}
+
+	if articleId < utils.SummaryArticleId {
+		articleInfo.Abstract, _ = cygx.GetReportContentTextSub(articleInfo.Abstract)
+		articleInfo.Body = html.UnescapeString(articleInfo.Body)
+	}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

controllers/eta_business/eta_business_menu.go

@@ -666,3 +666,99 @@ func (this *EtaBusinessMenuController) IconAdd() {
 	br.Success = true
 	br.Msg = "操作成功"
 }
+
+// SystemApiConfig
+// @Title 系统配置接口列表
+// @Description 系统配置接口列表
+// @Success 200 {object} []system.BusinessConf
+// @router /api/config/list [get]
+func (this *EtaBusinessMenuController) SystemApiConfig() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var relates []*eta_business.EtaBusinessConfigRelate
+	businessId, _ := this.GetInt("EtaBusinessId", 0)
+	var err error
+	if businessId > 0 {
+		relateOb := new(eta_business.EtaBusinessConfigRelate)
+		cond := ` AND eta_business_id = ?`
+		pars := make([]interface{}, 0)
+		pars = append(pars, businessId)
+		relates, err = relateOb.GetItemsByCondition(cond, pars, []string{}, "")
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取商家菜单关联列表失败, Err: " + err.Error()
+			return
+		}
+	}
+
+
+	br.Data = relates
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// SystemApiConfig
+// @Title 系统配置接口列表
+// @Description 系统配置接口列表
+// @Success 200 {object} []system.BusinessConf
+// @router /api/config/set [post]
+func (this *EtaBusinessMenuController) SystemApiConfigSet() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	var req eta_business.SetBusinessConfReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + e.Error()
+		return
+	}
+	ob := new(eta_business.EtaBusinessConfigRelate)
+	items := make([]*eta_business.EtaBusinessConfigRelate, 0)
+	for _, v := range req.List {
+		t := new(eta_business.EtaBusinessConfigRelate)
+		t.ConfigCode = v.ConfigCode
+		t.ConfigValue = v.ConfigValue
+		t.EtaBusinessId = req.EtaBusinessId
+		items = append(items, t)
+	}
+	if e := ob.CreateMulti(req.EtaBusinessId, items); e != nil {
+		br.Msg = "保存失败"
+		br.ErrMsg = "保存商家菜单关联失败, Err: " + e.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "设置成功"
+}

models/company/company_config.go

@@ -9,9 +9,11 @@ const (
 )
 
 type CrmConfig struct {
+	ConfigCode   string `description:"详情Code"`
 	ConfigValue string `description:"详情"`
 }
 
+
 func GetConfigValueByCode(configCode string) (total int, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT config_value FROM crm_config WHERE config_code=? `
@@ -29,7 +31,7 @@ func CrmConfigUpdate(newValue, configCode string) (err error) {
 
 func GetConfigDetailByCode(configCode string) (item CrmConfig, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT config_value FROM crm_config WHERE config_code=? `
+	sql := ` SELECT * FROM crm_config WHERE config_code=? `
 	err = o.Raw(sql, configCode).QueryRow(&item)
 	return
 }

models/cygx/activity_video.go

@@ -16,6 +16,8 @@ type CygxActivityVideo struct {
 	VideoUrl      string `description:"视频地址"`
 	BackgroundImg string `description:"封面图片"`
 	ShareImg      string `description:"分享图片"`
+	IsByHand      int    `description:"是否手动修改过"`
+	FileType      int    `description:"文件类型，1：路演回放，2：调研反馈"`
 	CreateTime    string `description:"创建时间"`
 }
 
@@ -69,6 +71,7 @@ func UpdateCygxActivityVideo(item *CygxActivityVideo) (err error) {
 	updateParams["VideoUrl"] = item.VideoUrl
 	updateParams["BackgroundImg"] = item.BackgroundImg
 	updateParams["ShareImg"] = item.ShareImg
+	updateParams["FileType"] = item.FileType
 	updateParams["ModifyDate"] = time.Now()
 	ptrStructOrTableName := "cygx_activity_video"
 	whereParam := map[string]interface{}{"activity_id": item.ActivityId}

models/cygx/activity_voice.go

@@ -14,6 +14,8 @@ type CygxActivityVoice struct {
 	VoicePlaySeconds string    `description:"音频时长"`
 	BackgroundImg    string    `description:"封面图片"`
 	ShareImg         string    `description:"分享图片"`
+	IsByHand         int       `description:"是否手动修改过"`
+	FileType         int       `description:"文件类型，1：路演回放，2：调研反馈"`
 	CreateTime       time.Time `description:"创建时间"`
 }
 
@@ -43,6 +45,7 @@ func UpdateCygxActivityVoice(item *CygxActivityVoice) (err error) {
 	updateParams["VoiceUrl"] = item.VoiceUrl
 	updateParams["BackgroundImg"] = item.BackgroundImg
 	updateParams["ShareImg"] = item.ShareImg
+	updateParams["FileType"] = item.FileType
 	ptrStructOrTableName := "cygx_activity_voice"
 	whereParam := map[string]interface{}{"activity_id": item.ActivityId}
 	qs := to.QueryTable(ptrStructOrTableName)
@@ -89,6 +92,26 @@ func GetActivityVoiceList(condition string, pars []interface{}) (items []*CygxAc
 	return
 }
 
+// 列表
+func GetActivityVoiceListNew(condition string, pars []interface{}) (items []*CygxActivityVoice, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := ` SELECT
+	v.*
+FROM
+	cygx_activity_voice as v  
+	INNER JOIN cygx_activity as  a ON a.activity_id = v.activity_id
+WHERE
+	1= 1 
+	AND a.activity_time > '2023-09-22'
+	AND  v.voice_name NOT LIKE '%调研反馈%'
+	AND  v.voice_name NOT LIKE '%【%'  `
+	if condition != "" {
+		sql += condition
+	}
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
 func GetCygxActivityVoiceReqDetail(activityId int) (item *CygxActivityVoice, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_activity_voice  WHERE activity_id= ? `
@@ -111,3 +134,11 @@ func GetCygxActivityVoiceReqDetailByActivityVoiceId(activityVoiceId int) (item *
 	err = o.Raw(sql, activityVoiceId).QueryRow(&item)
 	return
 }
+
+// 根据活动ID获取详情
+func GetCygxActivityVoiceReqDetailByActivityId(activityId int) (item *CygxActivityVoice, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT *  FROM cygx_activity_voice  WHERE activity_id= ? `
+	err = o.Raw(sql, activityId).QueryRow(&item)
+	return
+}

models/cygx/askserie_video.go

@@ -27,6 +27,7 @@ type CygxAskserieVideo struct {
 	ModifyDate          time.Time `description:"更新时间"`
 	PublishDate         time.Time `description:"发布时间"`
 	CreateTime          time.Time `description:"创建时间"`
+	ActivityId          int       ` description:"活动ID"`
 }
 
 type AddAskserieVideoReq struct {

models/db.go

@@ -260,6 +260,7 @@ func initCompany() {
 		new(company.CompanyNoRenewedNote),                    // 客户未续约记录
 		new(company.CompanyNoRenewedAscribe),                 // 确认不续约记录
 		new(company.CompanyNoRenewedAscribeLog),              // 确认不续约记录日志
+		new(company.CrmConfig),                               // 管理后台基本配置表
 	)
 }
 
@@ -682,6 +683,7 @@ func initEtaBusiness() {
 		new(eta_business.EtaBusinessOperationRecord), // ETA操作记录表
 		new(eta_business.EtaBusinessMenu),            // ETA商家菜单表
 		new(eta_business.EtaBusinessMenuRelate),      // ETA商家菜单关联表
+		new(eta_business.EtaBusinessConfigRelate),    // ETA商家配置关联表
 		new(eta_business.EtaBusinessMenuIcon),        // ETA商家菜单icon表
 	)
 }

models/eta_business/eta_business_config_relate.go

@@ -0,0 +1,118 @@
+package eta_business
+
+import (
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"strings"
+)
+
+// EtaBusinessConfigRelate ETA商家菜单api关联表
+type EtaBusinessConfigRelate struct {
+	Id            int `orm:"column(id);pk"`
+	EtaBusinessId int `description:"商家ID"`
+	ConfigCode    string `description:"配置编码"`
+	ConfigValue   string `description:"配置值"`
+}
+
+func (m *EtaBusinessConfigRelate) TableName() string {
+	return "eta_business_config_relate"
+}
+
+func (m *EtaBusinessConfigRelate) PrimaryId() string {
+	return "id"
+}
+
+
+func (m *EtaBusinessConfigRelate) CreateMulti(businessId int, items []*EtaBusinessConfigRelate) (err error) {
+	if businessId == 0 {
+		return
+	}
+	o := orm.NewOrm()
+	tx, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = tx.Rollback()
+			return
+		}
+		_ = tx.Commit()
+	}()
+
+	sql := fmt.Sprintf(`DELETE FROM %s WHERE eta_business_id = ?`, m.TableName())
+	_, err = tx.Raw(sql, businessId).Exec()
+	if err != nil {
+		return
+	}
+
+	if len(items) > 0 {
+		_, err = tx.InsertMulti(len(items), items)
+	}
+	return
+}
+
+func (m *EtaBusinessConfigRelate) Update(cols []string) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Update(m, cols...)
+	return
+}
+
+
+func (m *EtaBusinessConfigRelate) GetItemById(id int) (item *EtaBusinessConfigRelate, err error) {
+	o := orm.NewOrm()
+	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
+	err = o.Raw(sql, id).QueryRow(&item)
+	return
+}
+
+func (m *EtaBusinessConfigRelate) GetItemByCondition(condition string, pars []interface{}) (item *EtaBusinessConfigRelate, err error) {
+	o := orm.NewOrm()
+	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
+	err = o.Raw(sql, pars).QueryRow(&item)
+	return
+}
+
+func (m *EtaBusinessConfigRelate) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrm()
+	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
+	err = o.Raw(sql, pars).QueryRow(&count)
+	return
+}
+
+func (m *EtaBusinessConfigRelate) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*EtaBusinessConfigRelate, err error) {
+	o := orm.NewOrm()
+	fields := strings.Join(fieldArr, ",")
+	if len(fieldArr) == 0 {
+		fields = `*`
+	}
+	order := ``
+	if orderRule != "" {
+		order = ` ORDER BY ` + orderRule
+	}
+	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
+func (m *EtaBusinessConfigRelate) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*EtaBusinessConfigRelate, err error) {
+	o := orm.NewOrm()
+	fields := strings.Join(fieldArr, ",")
+	if len(fieldArr) == 0 {
+		fields = `*`
+	}
+	order := ``
+	if orderRule != "" {
+		order = ` ORDER BY ` + orderRule
+	}
+	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
+// EtaBusinessConfigRelateSaveReq 保存商家菜单关联
+type EtaBusinessConfigRelateSaveReq struct {
+	EtaBusinessId int   `description:"商家ID"`
+	MenuIds       []int `description:"菜单IDs"`
+	HalfMenuIds   []int `description:"半选菜单IDs-仅供前端回显用的"`
+}

models/eta_business/eta_business_menu.go

@@ -208,3 +208,20 @@ type EtaBusinessMenuEditReq struct {
 type EtaBusinessMenuRemoveReq struct {
 	MenuId int
 }
+
+// BusinessConf 商户配置表
+type BusinessConf struct {
+	ConfKey string `description:"配置Key"`
+	ConfVal string `description:"配置值"`
+}
+
+// SetBusinessConfReq 设置用户的配置
+type SetBusinessConfReq struct {
+	EtaBusinessId int `description:"商家ID"`
+	List          []BusinessConfReq
+}
+
+type BusinessConfReq struct {
+	ConfigCode  string `description:"配置编码"`
+	ConfigValue string `description:"配置值"`
+}

routers/commentsRouter.go

@@ -6865,6 +6865,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessMenuController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessMenuController"],
+        beego.ControllerComments{
+            Method: "SystemApiConfig",
+            Router: `/api/config/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessMenuController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessMenuController"],
+        beego.ControllerComments{
+            Method: "SystemApiConfigSet",
+            Router: `/api/config/set`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessMenuController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessMenuController"],
         beego.ControllerComments{
             Method: "Add",

services/cygx/activity_ocr.go

@@ -175,6 +175,21 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 			err = errors.New("GetCygxActivityVoiceCount" + e.Error())
 			return
 		}
+
+		activityId := itemVoice.ActivityId
+		//获取活动详情
+		activityInfo, e := cygx.GetAddActivityInfoById(activityId)
+		if e != nil {
+			err = errors.New("GetAddActivityInfoById, Err: " + e.Error())
+			return
+		}
+		//易董办会的分析师电话会，为路演回放
+		if (activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 7) && activityInfo.IsYidongConduct == 1 {
+			itemVoice.FileType = 1
+		} else {
+			itemVoice.FileType = 2
+		}
+
 		//如果等于0就新增，反之就修改
 		if total == 0 {
 			newId, e := cygx.AddCygxActivityVoice(itemVoice)
@@ -186,6 +201,16 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 
 			go SendWxMsgWithUpdateActivityVideoAndVoice(activityId, itemVoice.VoiceName) //  已结束的活动上传音频或视频后给已关注这个活动关联的产业的正式、试用 客户发送模板信息
 		} else {
+			//获取音频详情
+			voiceDetail, e := cygx.GetCygxActivityVoiceReqDetailByActivityId(activityId)
+			if e != nil {
+				err = errors.New("GetCygxActivityVoiceReqDetail" + e.Error())
+				return
+			}
+			//手动修改过的，二次编辑，文件类型不变
+			if voiceDetail.IsByHand == 1 {
+				itemVoice.FileType = voiceDetail.FileType
+			}
 			e = cygx.UpdateCygxActivityVoice(itemVoice)
 			if e != nil {
 				err = errors.New("UpdateCygxActivityVoice" + e.Error())
@@ -218,6 +243,19 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 			err = errors.New("GetActivityVideoCount" + e.Error())
 			return
 		}
+		activityId := itemVideo.ActivityId
+		//获取活动详情
+		activityInfo, e := cygx.GetAddActivityInfoById(activityId)
+		if e != nil {
+			err = errors.New("GetAddActivityInfoById, Err: " + e.Error())
+			return
+		}
+		//易董办会的分析师电话会，为路演回放
+		if (activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 7) && activityInfo.IsYidongConduct == 1 {
+			itemVideo.FileType = 1
+		} else {
+			itemVideo.FileType = 2
+		}
 		//视频文件更换阿里云oss地址 避免卡顿
 		var newOssUrl string
 		newOssUrl = strings.Replace(itemVideo.VideoUrl, "https://hzstatic.hzinsights.com", "https://hzchart.oss-accelerate.aliyuncs.com", -1)
@@ -232,6 +270,17 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 			go UpdateActivityVideoResourceData(int(newId))                               //写入首页最新  cygx_resource_data 表
 			go SendWxMsgWithUpdateActivityVideoAndVoice(activityId, itemVideo.VideoName) //  已结束的活动上传音频或视频后给已关注这个活动关联的产业的正式、试用 客户发送模板信息
 		} else {
+			//获取视频详情
+			videoDetail, e := cygx.GetCygxActivityVideoReqDetail(activityId)
+			if e != nil {
+				err = errors.New("GetCygxActivityVideoReqDetail" + e.Error())
+				return
+			}
+			//手动修改过的，二次编辑，文件类型不变
+			if videoDetail.IsByHand == 1 {
+				itemVideo.FileType = videoDetail.FileType
+			}
+
 			e = cygx.UpdateCygxActivityVideo(itemVideo)
 			if e != nil {
 				err = errors.New("UpdateCygxActivityVideo" + e.Error())

services/cygx/askserie_video.go

@@ -77,8 +77,8 @@ func GetCygxAskserieVideoLabelMap(askserieVideoIds []int) (mapResp map[int]strin
 func init12() {
 	var conditionupload string
 	var pars []interface{}
-	conditionupload = " AND  voice_name LIKE '%科技问答%' "
-	listVoice, err := cygx.GetActivityVoiceList(conditionupload, pars)
+	conditionupload = " "
+	listVoice, err := cygx.GetActivityVoiceListNew(conditionupload, pars)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		fmt.Println(err)
 		return
@@ -115,6 +115,7 @@ func init12() {
 			item.PublishStatus = 1
 			item.BackgroundImg = v.BackgroundImg
 			item.ShareImg = v.ShareImg
+			item.ActivityId = v.ActivityId
 			//item.AdminId = sysUser.AdminId
 			item.ModifyDate = time.Now()
 			item.PublishDate = utils.StrTimeToTime(activityInfo.ActivityTime)
@@ -124,7 +125,7 @@ func init12() {
 			fmt.Println(item.ShareImg, "ShareImg")
 			fmt.Println(item.PublishDate, "PublishDate")
 			//fmt.Println(item, strings.Join(industrialManagementIds, ","))
-
+			//continue
 			newId, err := cygx.AddCygxAskserieVideo(item, strings.Join(industrialManagementIds, ","))
 			fmt.Println(newId)
 			if err != nil {

services/cygx/resource_data.go

@@ -870,7 +870,7 @@ func UpdateActivityVoiceResourceData(sourceId int) {
 		item.SourceId = sourceId
 		item.Source = source
 		//易董办会的分析师电话会，为路演回放
-		if (activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 7) && activityInfo.IsYidongConduct == 1 {
+		if voiceDetail.FileType == 1 {
 			item.SearchTag = "路演回放"
 		} else {
 			item.SearchTag = "调研反馈"
@@ -946,11 +946,12 @@ func UpdateActivityVideoResourceData(sourceId int) {
 		item.SourceId = sourceId
 		item.Source = source
 		//易董办会的分析师电话会，为路演回放
-		if (activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 7) && activityInfo.IsYidongConduct == 1 {
+		if videoDetail.FileType == 1 {
 			item.SearchTag = "路演回放"
 		} else {
 			item.SearchTag = "调研反馈"
 		}
+
 		item.PublishDate = publishDate
 		item.ChartPermissionId = activityInfo.ChartPermissionId
 		item.CreateTime = utils.StrDateToDate(activityInfo.ActivityTime)