no message

controllers/cygx/activity_video.go

@@ -468,9 +468,12 @@ func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
 	}
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
+	var conditionVideo string
+	var conditionVoice string
 	var pars []interface{}
 	if keyWord != "" {
-		condition += ` AND (v.video_name LIKE '%` + keyWord + `%' )  `
+		conditionVideo += ` AND (v.video_name LIKE '%` + keyWord + `%' )  `
+		conditionVoice += ` AND (v.voice_name LIKE '%` + keyWord + `%' )  `
 	}
 	//行业名称
 	if chartPermissionId > 0 {
@@ -502,7 +505,7 @@ func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
 		conditionOrder += ` 	ORDER BY activity_time DESC  `
 	}
 
-	list, total, err := cygx.GetActivityVoiceAndVideoList(condition, conditionOrder, pars, startSize, pageSize)
+	list, total, err := cygx.GetActivityVoiceAndVideoList(condition, conditionVoice, conditionVideo, conditionOrder, pars, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()

controllers/cygx/askserie_video.go

@@ -125,6 +125,7 @@ func (this *AskserieVideoController) PreserveAndPublish() {
 // @Param   EndDate   query   string  false       "结束时间，列如2021-03-06 "
 // @Param   PublishStatus   query   int  true       "发布状态: -1-默认全部; 0-未发布; 1-已关注"
 // @Param   ChartPermissionId   query   string  false       "行业Id"
+// @Param   KeyWord   query   string  false       "搜索关键词"
 // @Success Ret=200 {object} cygx.GetCygxTacticsTimeLineResp
 // @router /askserie_video/list [get]
 func (this *AskserieVideoController) List() {
@@ -147,6 +148,9 @@ func (this *AskserieVideoController) List() {
 	startDate := this.GetString("StartDate")
 	endDate := this.GetString("EndDate")
 	chartPermissionId, _ := this.GetInt("ChartPermissionId")
+	keyWord := this.GetString("KeyWord")
+	keyWord = strings.Trim(keyWord, " ")
+	keyWord = strings.Replace(keyWord, "'", "", -1)
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -158,7 +162,7 @@ func (this *AskserieVideoController) List() {
 	var condition string
 	var pars []interface{}
 	//发布状态查询
-	if publishStatus == 0 || publishStatus == 1 {
+	if publishStatus == 0 || publishStatus == 1 || publishStatus == 3 {
 		condition += ` AND art.publish_status = ? `
 		pars = append(pars, publishStatus)
 	}
@@ -172,6 +176,9 @@ func (this *AskserieVideoController) List() {
 		condition += ` 	AND art.chart_permission_id = ?`
 		pars = append(pars, chartPermissionId)
 	}
+	if keyWord != "" {
+		condition += ` AND ( video_name LIKE '%` + keyWord + `%' ) `
+	}
 	total, err := cygx.GetCygxAskserieVideoCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -453,7 +460,7 @@ func (this *AskserieVideoController) PublishReport() {
 	if detail.PublishStatus == 0 {
 		status = 1
 	} else {
-		status = 0
+		status = 3
 	}
 	err = cygx.EditCygxAskserieVideoStatus(status, askserieVideoId)
 	if err != nil {

models/cygx/activity_video.go

@@ -219,7 +219,7 @@ func Updatevideo_url(video_url string, video_id int) (err error) {
 }
 
 // 获取数量
-func GetActivityVoiceAndVideoList(condition, conditionOrder string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, total int, err error) {
+func GetActivityVoiceAndVideoList(condition, conditionVoice, conditionVideo, conditionOrder string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, total int, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` 	
 		SELECT
@@ -238,7 +238,7 @@ func GetActivityVoiceAndVideoList(condition, conditionOrder string, pars []inter
 		cygx_activity AS art
 		INNER JOIN cygx_activity_voice AS v ON v.activity_id = art.activity_id 
 	WHERE
-		1 = 1 ` + condition
+		1 = 1 ` + condition + conditionVoice
 
 	sql += `	UNION ALL`
 	sql += ` SELECT
@@ -257,7 +257,7 @@ func GetActivityVoiceAndVideoList(condition, conditionOrder string, pars []inter
 		cygx_activity AS art
 		INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id 
 	WHERE
-		1 = 1  ` + condition + conditionOrder
+		1 = 1  ` + condition + conditionVideo + conditionOrder
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
 	err = o.Raw(totalSql, pars, pars).QueryRow(&total)
 	if err != nil {

models/cygx/micro_roadshow.go

@@ -132,6 +132,10 @@ func EditVideo(item *CygxMicroRoadshowVideo) (err error) {
 }
 
 func PublishVideoCancel(videoId, publishOrCancle int) (err error) {
+
+	if publishOrCancle == 0 {
+		publishOrCancle = 3 // 取消发布状态
+	}
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `UPDATE cygx_micro_roadshow_video SET publish_status=?,modify_date=NOW() WHERE video_id =?`
 	_, err = o.Raw(sql, publishOrCancle, videoId).Exec()