no message

models/industrial_management.go

@@ -364,7 +364,7 @@ func GetIndustrialManagementActivityHistoryCount() (items []*IndustrialManagemen
 			INNER JOIN cygx_activity AS a ON a.activity_id = h.activity_id 
 		WHERE
 			1 = 1 
-			AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( h.create_time ) 
+			AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( a.activity_time ) 
 		GROUP BY
 			mg.industrial_management_id `
 	o := orm.NewOrm()

models/report.go

@@ -548,7 +548,7 @@ func GetThemeHeatList(userId int, condition, conditionOrder string, startSize, p
           	MAX( a.publish_date ) AS publish_date,
 			MIN(a.publish_date) AS min_report_time,
 			( SELECT count( 1 ) FROM cygx_industry_fllow AS f  WHERE f.industrial_management_id = m.industrial_management_id  AND user_id =? AND f.type = 1  ) AS fllow_num,
-			m.article_read_num + ( SELECT count( 1 ) FROM cygx_activity_meet_detail_log AS la  WHERE la.activity_id  IN  (SELECT activity_id FROM cygx_industrial_activity_group_management WHERE industrial_management_id = m.industrial_management_id  ) AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( la.activity_time ) ) AS sum_num
+			m.yanxuan_article_read_num + m.activity_num AS sum_num
 		FROM
 			cygx_industrial_management AS m
 			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.industrial_management_id = m.industrial_management_id

services/industrial_management.go

@@ -77,38 +77,23 @@ func UpdateIndustrialManagementSubjectNnames() (err error) {
 }
 
 func ChageIndustrialArticleNum(cont context.Context) (err error) {
-	allList, err := models.IndustrialManagementAll()
-	if err != nil {
-		fmt.Println("GetArticleAll Err:", err.Error())
-		return
-	}
-	for _, v := range allList {
-		total, errTop := models.GetIndustrialManagementArtCount(v.IndustrialManagementId)
-		if errTop != nil {
-			fmt.Println("Top Err:", errTop.Error())
-			return
-		}
-		if total > 0 {
-			err = models.UpdateIndustrialManagementArtReadNum(total, v.IndustrialManagementId)
-			if err != nil {
-				fmt.Println("Update Err:", err.Error())
-				return
-			}
-		}
-	}
-	return
-}
-
-func init() {
 	IndustrialHzArticleNumUpdate()
 	IndustrialYxArticleNumUpdate()
 	IndustrialActivityNumUpdate()
+	return
 }
 
+//func init() {
+//	IndustrialHzArticleNumUpdate()
+//	IndustrialYxArticleNumUpdate()
+//	IndustrialActivityNumUpdate()
+//}
+
 // 更改弘则对应的报告关联产业近一个月的阅读量
 func IndustrialHzArticleNumUpdate() (err error) {
 	defer func() {
 		if err != nil {
+			//fmt.Println(err)
 			go utils.SendAlarmMsg("更改弘则对应的报告关联产业近一个月的阅读量失败"+err.Error(), 2)
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"更改弘则对应的报告关联产业近一个月的阅读量失败失败提醒", err.Error(), utils.EmailSendToUsers)
 		}
@@ -132,7 +117,6 @@ func IndustrialHzArticleNumUpdate() (err error) {
 		return
 	}
 	for _, v := range list {
-		fmt.Println(v)
 		err = models.UpdateIndustrialManagementArtReadNum(v.Count, v.IndustrialManagementId)
 		if err != nil {
 			return
@@ -145,6 +129,7 @@ func IndustrialHzArticleNumUpdate() (err error) {
 func IndustrialYxArticleNumUpdate() (err error) {
 	defer func() {
 		if err != nil {
+			//fmt.Println(err)
 			go utils.SendAlarmMsg("更改研选对应的报告关联产业近一个月的阅读量失败"+err.Error(), 2)
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"更改研选对应的报告关联产业近一个月的阅读量失败提醒", err.Error(), utils.EmailSendToUsers)
 		}
@@ -164,7 +149,6 @@ func IndustrialYxArticleNumUpdate() (err error) {
 		return
 	}
 	for _, v := range list {
-		fmt.Println(v)
 		err = models.UpdateIndustrialManagementArtYanXuanReadNum(v.Count, v.IndustrialManagementId)
 		if err != nil {
 			return
@@ -177,6 +161,7 @@ func IndustrialYxArticleNumUpdate() (err error) {
 func IndustrialActivityNumUpdate() (err error) {
 	defer func() {
 		if err != nil {
+			//fmt.Println(err)
 			go utils.SendAlarmMsg("更改活动关联产业近一个月的到会量失败"+err.Error(), 2)
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"更改活动关联产业近一个月的到会量失败", err.Error(), utils.EmailSendToUsers)
 		}
@@ -187,7 +172,6 @@ func IndustrialActivityNumUpdate() (err error) {
 		return
 	}
 	for _, v := range list {
-		fmt.Println(v)
 		err = models.UpdateIndustrialManagementActivityNum(v.Count, v.IndustrialManagementId)
 		if err != nil {
 			return