xingzai 1 tahun lalu
induk
melakukan
744f2f87df
2 mengubah file dengan 66 tambahan dan 3 penghapusan
  1. 1 1
      models/cygx/industrial_management.go
  2. 65 2
      services/cygx/resource_data.go

+ 1 - 1
models/cygx/industrial_management.go

@@ -874,7 +874,7 @@ func UpdateIndustrialManagementArticleNewPublishData(items map[int]string) (err
 	return
 	return
 }
 }
 
 
-// GetTopOneMonthArtReadNumIndustry 获取近一个月报告阅读数量最多的产业信息 根据行业分组
+// GetTopOneMonthArtReadNumIndustry 获取列表
 func GetTopOneMonthArtReadNumIndustryAll(condition string, pars []interface{}) (items []*IndustrialManagement, err error) {
 func GetTopOneMonthArtReadNumIndustryAll(condition string, pars []interface{}) (items []*IndustrialManagement, err error) {
 	sql := `SELECT * FROM cygx_industrial_management WHERE 1 = 1 `
 	sql := `SELECT * FROM cygx_industrial_management WHERE 1 = 1 `
 	if condition != `` {
 	if condition != `` {

+ 65 - 2
services/cygx/resource_data.go

@@ -26,7 +26,7 @@ import (
 //roadshow
 //roadshow
 
 
 //func init() {
 //func init() {
-//	UpdateArticleResourceData(1000004)
+//	UpdateMeetingreviewchaptResourceData(105)
 //}
 //}
 
 
 // 更新活动
 // 更新活动
@@ -536,6 +536,12 @@ func UpdateMeetingreviewchaptResourceData(sourceId int) {
 			err = errors.New("GetCygxReportSelectionBySourceAndId, Err: " + e.Error())
 			err = errors.New("GetCygxReportSelectionBySourceAndId, Err: " + e.Error())
 			return
 			return
 		}
 		}
+		detail, e := cygx.GetCygxMorningMeetingReviewChapterDetail(sourceId)
+		if e != nil {
+			err = errors.New("GetCygxMorningMeetingReviewChapterDetail" + e.Error())
+			return
+		}
+		var resourceDataId int
 		publishDate := time.Now().Format(utils.FormatDateTime)
 		publishDate := time.Now().Format(utils.FormatDateTime)
 		item := new(cygx.CygxResourceData)
 		item := new(cygx.CygxResourceData)
 		item.SourceId = sourceId
 		item.SourceId = sourceId
@@ -544,18 +550,75 @@ func UpdateMeetingreviewchaptResourceData(sourceId int) {
 		item.PublishDate = publishDate
 		item.PublishDate = publishDate
 		item.CreateTime = time.Now()
 		item.CreateTime = time.Now()
 		if totalData == 0 {
 		if totalData == 0 {
-			_, e = cygx.AddCygxResourceData(item)
+			newId, e := cygx.AddCygxResourceData(item)
 			if e != nil {
 			if e != nil {
 				err = errors.New("AddCygxResourceData, Err: " + e.Error())
 				err = errors.New("AddCygxResourceData, Err: " + e.Error())
 				return
 				return
 			}
 			}
+			resourceDataId = int(newId)
 		} else {
 		} else {
 			e = cygx.UpdateResourceDataByItem(item)
 			e = cygx.UpdateResourceDataByItem(item)
 			if e != nil {
 			if e != nil {
 				err = errors.New("UpdateResourceData, Err: " + e.Error())
 				err = errors.New("UpdateResourceData, Err: " + e.Error())
 				return
 				return
 			}
 			}
+			sourceDetail, e := cygx.GetCygxResourceDataByIdAndSource(sourceId, source)
+			if e != nil {
+				err = errors.New("UpdateResourceData, Err: " + e.Error())
+				return
+			}
+			resourceDataId = sourceDetail.Id
+		}
+		var condition string
+		var pars []interface{}
+		condition = " AND industrial_management_id = ? "
+		pars = append(pars, detail.IndustryId)
+		//建立首页资源表,与产业的关系
+		industrialList, e := cygx.GetTopOneMonthArtReadNumIndustryAll(condition, pars)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			err = errors.New("GetTopOneMonthArtReadNumIndustryAll, Err: " + e.Error() + "sourceId:" + strconv.Itoa(sourceId))
+			return
 		}
 		}
+		var industrialItems []*cygx.CygxResourceDataIndustrialGroupManagement
+		for _, v := range industrialList {
+			var industrialItem = new(cygx.CygxResourceDataIndustrialGroupManagement)
+			industrialItem.SourceId = sourceId
+			industrialItem.Source = source
+			industrialItem.IndustrialManagementId = v.IndustrialManagementId
+			industrialItem.ResourceDataId = resourceDataId
+			industrialItem.CreateTime = time.Now()
+			industrialItems = append(industrialItems, industrialItem)
+		}
+		var subjectItems []*cygx.CygxResourceDataIndustrialGroupSubject
+		//晨会精华如果关联的标的就做查询
+		if detail.IndustrialSubjectIds != "" {
+			condition = ""
+			pars = make([]interface{}, 0)
+			condition = " AND industrial_subject_id  IN (" + detail.IndustrialSubjectIds + ") "
+			//建立首页资源表,与标的 的关系
+			subjectList, e := cygx.GetCygxIndustrialSubjectListCondition(condition, pars)
+			if e != nil && e.Error() != utils.ErrNoRow() {
+				err = errors.New("GetCygxIndustrialSubjectListCondition, Err: " + e.Error() + "sourceId:" + strconv.Itoa(sourceId))
+				return
+			}
+			for _, v := range subjectList {
+				var subjectItem = new(cygx.CygxResourceDataIndustrialGroupSubject)
+				subjectItem.SourceId = sourceId
+				subjectItem.Source = source
+				subjectItem.IndustrialSubjectId = v.IndustrialSubjectId
+				subjectItem.ResourceDataId = resourceDataId
+				subjectItem.CreateTime = time.Now()
+				subjectItems = append(subjectItems, subjectItem)
+			}
+		}
+
+		//插入关联信息
+		e = cygx.AddCygxResourceDataGroup(sourceId, source, industrialItems, subjectItems)
+		if e != nil {
+			err = errors.New("AddCygxResourceDataGroup, Err: " + e.Error())
+			return
+		}
+
 	}
 	}
 	return
 	return
 }
 }