Browse Source

no message

xingzai 1 year ago
parent
commit
adc053f56f
3 changed files with 25 additions and 3 deletions
  1. 20 0
      models/cygx/activity_voice.go
  2. 1 0
      models/cygx/askserie_video.go
  3. 4 3
      services/cygx/askserie_video.go

+ 20 - 0
models/cygx/activity_voice.go

@@ -89,6 +89,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= ? `

+ 1 - 0
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 {

+ 4 - 3
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 {