Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into clpt_v3.0

controllers/report.go

@@ -172,16 +172,6 @@ func (this *MobileReportController) IndustryList() {
 	if currentIndex <= 0 {
 		currentIndex = 1
 	}
-
-	//if isBillboard {
-	//	if pageSize == 0 {
-	//		pageSize = utils.PageSize15
-	//	} else {
-	//		pageSize = utils.PageSize5
-	//	}
-	//	currentIndex = 1
-	//}
-
 	startSize = paging.StartIndex(currentIndex, pageSize)
 	if ChartPermissionId > 0 {
 		condition += ` AND man.chart_permission_id IN (` + strconv.Itoa(ChartPermissionId) + `)`

models/report.go

@@ -368,3 +368,29 @@ func GetTimeLineReportIndustrialList(industrialManagementId, startSize, pageSize
 	_, err = o.Raw(sql, industrialManagementId, industrialManagementId, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+type IndustrialPublishdate struct {
+	PublishDate            string `description:"发布时间"`
+	IndustrialManagementId int    `description:"产业D"`
+}
+
+//标的列表
+func GetTimeLineReportIndustrialPublishdateList(industrialIdArr []int) (items []*IndustrialPublishdate, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT	
+			mmc.id,
+			0,
+			mmc.industry_id AS industrial_management_id,			
+			mmc.content AS title,
+			MAX( mm.meeting_time ) AS publish_date 
+		FROM
+			cygx_morning_meeting_review_chapter AS mmc
+			INNER JOIN cygx_morning_meeting_reviews AS mm 
+		WHERE
+			mm.id = mmc.meeting_id 
+			AND mm.STATUS = 1 
+			AND mmc.industry_id IN (` + utils.GetOrmInReplace(len(industrialIdArr)) + `)
+		GROUP BY industrial_management_id ORDER BY publish_date DESC  `
+	_, err = o.Raw(sql, industrialIdArr).QueryRows(&items)
+	return
+}

services/industrial_management.go

@@ -149,6 +149,20 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 		articleIdArr = append(articleIdArr, v.ArticleId)
 	}
 
+	//时间线的更新时间
+	//	maptimelineUPdateTime := make(map[int]string)
+	listtimelinePublishdate, err := models.GetTimeLineReportIndustrialPublishdateList(industrialIdArr)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+	for _, v := range listtimelinePublishdate {
+		if mapUPdateTime[v.IndustrialManagementId] != "" {
+			if utils.StrTimeToTime(v.PublishDate).After(utils.StrTimeToTime(mapUPdateTime[v.IndustrialManagementId])) {
+				mapUPdateTime[v.IndustrialManagementId] = v.PublishDate
+			}
+		}
+	}
+
 	mapHistroyArticleId := make(map[int]int)
 
 	if userId > 0 {