xingzai 1 vuosi sitten
vanhempi
commit
52d4e0c95e
2 muutettua tiedostoa jossa 39 lisäystä ja 0 poistoa
  1. 26 0
      models/industrial_management.go
  2. 13 0
      services/industrial_management.go

+ 26 - 0
models/industrial_management.go

@@ -765,6 +765,32 @@ func GetNewArticleDetailByIndustrialIds(industrialIdArr []int) (items []*Industr
 	return
 }
 
+// 获取该产业下最新的产品内测详情
+func GetNewProductInteriorByIndustrialIds(industrialIdArr []int) (items []*IndustrialManagementArticle, err error) {
+	arrLen := len(industrialIdArr)
+	if arrLen == 0 {
+		return
+	}
+	o := orm.NewOrm()
+	sql := `SELECT
+			mg.industrial_management_id,
+			MAX( a.product_interior_id ) AS article_id,
+			a.title,
+			MAX( a.publish_time ) AS publish_date 
+		FROM
+			cygx_product_interior_industrial_group_management AS mg
+			INNER JOIN cygx_product_interior AS a ON mg.product_interior_id = a.product_interior_id 
+		WHERE
+			1 = 1 
+			AND a.STATUS = 1 
+			AND a.visible_range = 1 
+			AND mg.industrial_management_id IN(` + utils.GetOrmInReplace(len(industrialIdArr)) + `)   
+		GROUP BY
+			mg.industrial_management_id`
+	_, err = o.Raw(sql, industrialIdArr).QueryRows(&items)
+	return
+}
+
 // GetIndustrialManagementArticleNewPublishData 获取产业关联文章的最新发布时间
 func GetIndustrialManagementArticleNewPublishData() (items []*IndustrialManagement, err error) {
 	o := orm.NewOrm()

+ 13 - 0
services/industrial_management.go

@@ -477,6 +477,19 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 		}
 	}
 
+	//产品内测的更新时间线
+	listtProductInterior, err := models.GetNewProductInteriorByIndustrialIds(industrialIdArr)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+	for _, v := range listtProductInterior {
+		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 {