Merge branch 'cygx4.2_web' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

models/activity_video.go

@@ -34,7 +34,7 @@ type CygxActivityVideoReq struct {
 	VideoUrl      string `description:"视频地址"`
 }
 
-//活动详情
+// 活动详情
 type CygxActivityVideoListResp struct {
 	ActivityId    int    `description:"活动ID 等于0新增活动，大于0修改活动"`
 	Id            int    `orm:"column(video_id)";description:"视频id"`
@@ -48,7 +48,7 @@ type CygxActivityVideoListRep struct {
 	List   []*CygxActivityVideoListResp
 }
 
-//列表
+// 列表
 func GetActivityVideoListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.*,v.video_id,v.video_name,v.video_url,video_duration FROM cygx_activity as art  INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id   WHERE 1= 1  `
@@ -60,7 +60,7 @@ func GetActivityVideoListAll(condition string, pars []interface{}, startSize, pa
 	return
 }
 
-//列表
+// 列表
 func GetActivityVideoList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -109,7 +109,8 @@ func GetCygxActivityVideoById(videoId int) (item *CygxActivityVideoDetailResp, e
 			v.video_url AS resource_url,
 			v.video_duration AS play_seconds,
 			v.activity_id,
-			a.chart_permission_id 
+			a.chart_permission_id,
+			a.chart_permission_name
 		FROM
 			cygx_activity_video AS v
 			INNER JOIN cygx_activity AS a 
@@ -120,7 +121,7 @@ func GetCygxActivityVideoById(videoId int) (item *CygxActivityVideoDetailResp, e
 	return
 }
 
-//GetMicroRoadshowVideoByVideoIdCount  根据视频ID查询产业视频是否存在
+// GetMicroRoadshowVideoByVideoIdCount  根据视频ID查询产业视频是否存在
 func GetActivityVideoByVideoIdCount(videoId int) (count int, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT COUNT(1) count
@@ -133,4 +134,3 @@ type ActivityVideoDetailResp struct {
 	VideoDetail *CygxActivityVideoDetailResp
 	AuthInfo    *UserPermissionAuthInfo
 }
-