Browse Source

no message

xingzai 1 year ago
parent
commit
0c28317ac7

+ 34 - 18
controllers/cygx/activity_video.go

@@ -192,6 +192,10 @@ func (this *ActivityVideoCoAntroller) VideoDeatil() {
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
+
+	for _, v := range list {
+		v.RegisterPlatform = utils.CYGX_REGISTER_PLATFORM_MAP[v.RegisterPlatform]
+	}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -349,6 +353,7 @@ func (this *ActivityVideoCoAntroller) CommentList() {
 // @Description 获取音视频上传之后的封面图
 // @Param   ActivityId   query   int  true       "活动ID"
 // @Param   FileType   query   int  true       "音视频文件类型 。1:音频。2:视频"
+// @Param   ChartPermissionId     query   int  true       "行业ID"
 // @Success 200 {object} cygx.ChartPermissionRepMoreList
 // @router /activityVideo/video_and_voice/img [get]
 func (this *ActivityVideoCoAntroller) VideoAndVoice() {
@@ -364,19 +369,6 @@ func (this *ActivityVideoCoAntroller) VideoAndVoice() {
 		br.Ret = 408
 		return
 	}
-	activityId, _ := this.GetInt("ActivityId")
-	fileType, _ := this.GetInt("FileType")
-	if activityId < 1 {
-		br.Msg = "请输入活动ID"
-		return
-	}
-	activityInfo, err := cygx.GetAddActivityInfoById(activityId)
-	if err != nil {
-		br.Msg = "活动不存在"
-		br.ErrMsg = "活动ID错误,Err:" + err.Error() + "activityId:" + strconv.Itoa(activityId)
-		return
-	}
-	//key := utils.MicroRoadshowDefaultImgKey
 	conf, err := cygx.GetCygxConfigDetailByCode("activity_video_default_img")
 	if err != nil {
 		br.Msg = "获取微路演默认图配置失败" + err.Error()
@@ -388,19 +380,43 @@ func (this *ActivityVideoCoAntroller) VideoAndVoice() {
 		return
 	}
 	resp := new(cygx.ActivityVideoDefaultImgListResp)
-	if fileType == 1 {
+	chartPermissionId, _ := this.GetInt("ChartPermissionId")
+	activityId, _ := this.GetInt("ActivityId")
+	fileType, _ := this.GetInt("FileType")
+
+	if chartPermissionId > 0 {
 		for _, v := range list.Audio {
-			if v.ChartPermissionId == activityInfo.ChartPermissionId {
+			if v.ChartPermissionId == chartPermissionId {
 				resp.List = v.List
 			}
 		}
 	} else {
-		for _, v := range list.Video {
-			if v.ChartPermissionId == activityInfo.ChartPermissionId {
-				resp.List = v.List
+		if activityId < 1 {
+			br.Msg = "请输入活动ID"
+			return
+		}
+		activityInfo, err := cygx.GetAddActivityInfoById(activityId)
+		if err != nil {
+			br.Msg = "活动不存在"
+			br.ErrMsg = "活动ID错误,Err:" + err.Error() + "activityId:" + strconv.Itoa(activityId)
+			return
+		}
+		//key := utils.MicroRoadshowDefaultImgKey
+		if fileType == 1 {
+			for _, v := range list.Audio {
+				if v.ChartPermissionId == activityInfo.ChartPermissionId {
+					resp.List = v.List
+				}
+			}
+		} else {
+			for _, v := range list.Video {
+				if v.ChartPermissionId == activityInfo.ChartPermissionId {
+					resp.List = v.List
+				}
 			}
 		}
 	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

+ 4 - 0
controllers/cygx/askserie_video.go

@@ -288,6 +288,7 @@ func (this *AskserieVideoController) HistoryList() {
 
 	for _, v := range list {
 		v.PlaySeconds = v.VideoDuration
+		v.RegisterPlatform = utils.CYGX_REGISTER_PLATFORM_MAP[v.RegisterPlatform]
 	}
 	resp.List = list
 	br.Ret = 200
@@ -339,6 +340,9 @@ func (this *AskserieVideoController) CollectionList() {
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
+	for _, v := range list {
+		v.RegisterPlatform = utils.CYGX_REGISTER_PLATFORM_MAP[v.RegisterPlatform]
+	}
 	resp.List = list
 	//导出excel
 	if isExport {

+ 3 - 0
controllers/cygx/micro_roadshow.go

@@ -711,6 +711,9 @@ func (this *MicroRoadshowController) VoiceDeatil() {
 		return
 	}
 
+	for _, v := range list {
+		v.RegisterPlatform = utils.CYGX_REGISTER_PLATFORM_MAP[v.RegisterPlatform]
+	}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

+ 2 - 2
models/cygx/askserie_video_history_record.go

@@ -13,7 +13,7 @@ type CygxAskserieVideoHistoryRecordResp struct {
 	CompanyName      string `description:"公司名称"`
 	RealName         string `description:"用户实际名称"`
 	SellerName       string `description:"所属销售"`
-	RegisterPlatform int    `description:"来源 1小程序,2:网页"`
+	RegisterPlatform string `description:"来源 1小程序,2:网页"`
 	ModifyTime       string `description:"更新时间"`
 	VideoDuration    string `description:"视频时长"`
 	PlaySeconds      string `description:"播放时间 单位s"`
@@ -51,7 +51,7 @@ type CygxAskserieVideoCollectionResp struct {
 	CompanyName      string `description:"公司名称"`
 	RealName         string `description:"用户实际名称"`
 	SellerName       string `description:"所属销售"`
-	RegisterPlatform int    `description:"来源 1小程序,2:网页"`
+	RegisterPlatform string `description:"来源 1小程序,2:网页"`
 	ModifyTime       string `description:"更新时间"`
 	Content          string `description:"留言"`
 }

+ 14 - 13
models/cygx/micro_roadshow.go

@@ -312,19 +312,20 @@ type MicroRoadshowVideoHistoryListResp struct {
 }
 
 type CygxMicroRoadshowVoiceHistory struct {
-	Id          int       `orm:"column(id);pk"description:"音频id"`
-	VideoId     int       `description:"微路演音频id"`
-	ActivityId  int       `description:"活动id"`
-	UserId      int       `description:"用户id"`
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司Id"`
-	CompanyName string    `description:"公司名称"`
-	RealName    string    `description:"用户实际名称"`
-	SellerName  string    `description:"所属销售"`
-	PlaySeconds string    `description:"播放时间 单位s"`
-	CreateTime  string    `description:"视频创建时间"`
-	ModifyTime  time.Time `description:"视频修改时间"`
+	Id               int       `orm:"column(id);pk"description:"音频id"`
+	VideoId          int       `description:"微路演音频id"`
+	ActivityId       int       `description:"活动id"`
+	UserId           int       `description:"用户id"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司Id"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	PlaySeconds      string    `description:"播放时间 单位s"`
+	CreateTime       string    `description:"视频创建时间"`
+	ModifyTime       time.Time `description:"视频修改时间"`
+	RegisterPlatform string    `description:"来源 1小程序,2:网页"`
 }
 
 func GetMicroRoadshowVoiceHistoryById(condition string, pars []interface{}) (item []*CygxMicroRoadshowVoiceHistory, err error) {

+ 5 - 0
utils/constants.go

@@ -410,6 +410,11 @@ const (
 	HONG_GUAN_NAME                          string = "宏观"
 )
 
+var CYGX_REGISTER_PLATFORM_MAP = map[string]string{
+	"1": "小程序",
+	"2": "网页版",
+}
+
 const (
 	CYGX_OBJ_ARTICLE            string = "article"            // 对象类型:文章
 	CYGX_OBJ_ACTIVITY           string = "activity"           // 对象类型:活动