Merge branch 'cygx/cygx_12.4.1' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/askserie_video.go

@@ -467,7 +467,7 @@ func (this *AskserieVideoController) PublishReport() {
 		return
 	}
 	var status int
-	if detail.PublishStatus == 0 {
+	if detail.PublishStatus != 1 {
 		status = 1
 	} else {
 		status = 3

models/cygx/askserie_video.go

@@ -97,6 +97,9 @@ func AddCygxAskserieVideo(item *CygxAskserieVideo, industrialManagementIds strin
 	for _, v := range industrialManagementIdList {
 		itemIndustrialManagementGroup := new(CygxIndustrialAskserieVideoGroupManagement)
 		newIndustrialId, _ := strconv.Atoi(v)
+		if newIndustrialId == 0 {
+			continue
+		}
 		itemIndustrialManagementGroup.CreateTime = time.Now()
 		itemIndustrialManagementGroup.AskserieVideoId = int(newId)
 		itemIndustrialManagementGroup.IndustrialManagementId = newIndustrialId

services/cygx/askserie_video.go

@@ -74,63 +74,6 @@ func GetCygxAskserieVideoLabelMap(askserieVideoIds []int) (mapResp map[int]strin
 //	UpdateAskserieVideoResourceData(75)
 //}
 
-// 更新问答系列  写入首页最新  cygx_resource_data 表
-func UpdateAskserieVideoResourceData(sourceId int) {
-	var err error
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-			go alarm_msg.SendAlarmMsg(fmt.Sprint("更新问答系列ourceId: ", sourceId, err.Error()), 2)
-		}
-	}()
-	var source = utils.CYGX_OBJ_ASKSERIEVIDEO
-	var condition string
-	var pars []interface{}
-	condition = ` AND publish_status = 1  AND  askserie_video_id = ?  `
-	pars = append(pars, sourceId)
-	total, e := cygx.GetCygxAskserieVideoCount(condition, pars)
-
-	if e != nil {
-		err = errors.New("GetCygxAskserieVideoCount, Err: " + e.Error())
-		return
-	}
-	//如果取消发布了就做删除处理
-	if total == 0 {
-		e = cygx.DeleteResourceData(sourceId, source)
-		if e != nil {
-			err = errors.New("DeleteResourceData, Err: " + e.Error())
-			return
-		}
-	} else {
-		//判断是否存在，如果不存在就新增，存在就更新
-		totalData, e := cygx.GetCygxResourceDataBySourceAndIdCount(sourceId, source)
-		if e != nil {
-			err = errors.New("GetCygxReportSelectionBySourceAndId, Err: " + e.Error())
-			return
-		}
-		publishDate := time.Now().Format(utils.FormatDateTime)
-		item := new(cygx.CygxResourceData)
-		item.SourceId = sourceId
-		item.Source = source
-		item.PublishDate = publishDate
-		item.CreateTime = time.Now()
-		if totalData == 0 {
-			_, e := cygx.AddCygxResourceData(item)
-			if e != nil {
-				err = errors.New("AddCygxResourceData, Err: " + e.Error())
-				return
-			}
-		} else {
-			e = cygx.UpdateResourceDataByItem(item)
-			if e != nil {
-				err = errors.New("UpdateResourceDataByItem, Err: " + e.Error())
-				return
-			}
-		}
-	}
-	return
-}
-
 func init12() {
 	var conditionupload string
 	var pars []interface{}
@@ -182,12 +125,12 @@ func init12() {
 			fmt.Println(item.PublishDate, "PublishDate")
 			//fmt.Println(item, strings.Join(industrialManagementIds, ","))
 
-			//newId, err := cygx.AddCygxAskserieVideo(item, strings.Join(industrialManagementIds, ","))
-			//fmt.Println(newId)
-			//if err != nil {
-			//	fmt.Println(err)
-			//	return
-			//}
+			newId, err := cygx.AddCygxAskserieVideo(item, strings.Join(industrialManagementIds, ","))
+			fmt.Println(newId)
+			if err != nil {
+				fmt.Println(err)
+				return
+			}
 		}
 	}
 }

services/cygx/resource_data.go

@@ -1024,6 +1024,74 @@ func UpdateMicroRoadshowResourceData(sourceId int) {
 	return
 }
 
+//func init() {
+//	UpdateAskserieVideoResourceData(7)
+//}
+
+// 更新问答系列  写入首页最新  cygx_resource_data 表
+func UpdateAskserieVideoResourceData(sourceId int) {
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go alarm_msg.SendAlarmMsg(fmt.Sprint("更新问答系列ourceId: ", sourceId, err.Error()), 2)
+		}
+	}()
+	var source = utils.CYGX_OBJ_ASKSERIEVIDEO
+	var condition string
+	var pars []interface{}
+	condition = ` AND publish_status = 1  AND  askserie_video_id = ?  `
+	pars = append(pars, sourceId)
+	total, e := cygx.GetCygxAskserieVideoCount(condition, pars)
+
+	if e != nil {
+		err = errors.New("GetCygxAskserieVideoCount, Err: " + e.Error())
+		return
+	}
+	//如果取消发布了就做删除处理
+	if total == 0 {
+		e = cygx.DeleteResourceData(sourceId, source)
+		if e != nil {
+			err = errors.New("DeleteResourceData, Err: " + e.Error())
+			return
+		}
+	} else {
+		//判断是否存在，如果不存在就新增，存在就更新
+		totalData, e := cygx.GetCygxResourceDataBySourceAndIdCount(sourceId, source)
+		if e != nil {
+			err = errors.New("GetCygxReportSelectionBySourceAndId, Err: " + e.Error())
+			return
+		}
+		detail, e := cygx.GetCygxAskserieVideoDetail(sourceId)
+		if e != nil {
+			err = errors.New("GetCygxAskserieVideoDetail, Err: " + e.Error())
+			return
+		}
+
+		publishDate := time.Now().Format(utils.FormatDateTime)
+		item := new(cygx.CygxResourceData)
+		item.SourceId = sourceId
+		item.Source = source
+		item.PublishDate = publishDate
+		item.ChartPermissionId = detail.ChartPermissionId
+		item.CreateTime = time.Now()
+		if totalData == 0 {
+			_, e := cygx.AddCygxResourceData(item)
+			if e != nil {
+				err = errors.New("AddCygxResourceData, Err: " + e.Error())
+				return
+			}
+		} else {
+			e = cygx.UpdateResourceDataByItem(item)
+			if e != nil {
+				err = errors.New("UpdateResourceDataByItem, Err: " + e.Error())
+				return
+			}
+		}
+	}
+	return
+}
+
 func init23() {
 	//var condition string
 	//var pars []interface{}