Merge branch 'cygx_9.2' into debug

models/report.go

@@ -3,7 +3,6 @@ package models
 import (
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"hongze/hongze_cygx/utils"
 	"strconv"
 	//"github.com/rdlucklib/rdluck_tools/paging"
 )
@@ -930,13 +929,13 @@ type ArticleIdReq struct {
 
 type IndustrialReadNum struct {
 	IndustrialManagementId int `description:"产业id"`
-	ReadNum                int `description:"阅读次数"`
+	Readnum                int `description:"阅读次数"`
 }
 
 //获取该产业下文章的用户阅读次数-小红点用
-func GetReportIndustrialReadNumList(userId int, industrialIdArr []int) (items []*IndustrialReadNum, err error) {
+func GetReportIndustrialReadNumList(userId int, industrialIds string) (items []*IndustrialReadNum, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT a.industrial_management_id, SUM(a.readnum) FROM (
+	sql := `SELECT a.industrial_management_id, SUM(a.readnum) AS readnum FROM (
 SELECT man_g.industrial_management_id,( SELECT COUNT( 1 ) FROM cygx_article_history_record AS rec WHERE rec.user_id = ` + strconv.Itoa(userId) + ` AND rec.article_id = a.article_id ) AS readnum 
 FROM
 	cygx_article AS a 
@@ -944,9 +943,9 @@ FROM
 WHERE
 	a.publish_status = 1 
 	AND a.is_class = 1
-	AND man_g.industrial_management_id IN (` + utils.GetOrmInReplace(len(industrialIdArr)) + `)  
+	AND man_g.industrial_management_id IN (` + industrialIds + `)  
 GROUP BY a.article_id ORDER BY publish_date DESC
 ) AS a GROUP BY industrial_management_id`
-	_, err = o.Raw(sql, industrialIdArr).QueryRows(&items)
+	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

services/industrial_management.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -407,10 +408,15 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 	//		mapHistroyArticleId[v.ArticleId] = v.ArticleId
 	//	}
 	//}
-	articleList, err := models.GetReportIndustrialReadNumList(userId, industrialIdArr)
+	var industrialIds string
+	for _, id := range industrialIdArr {
+		industrialIds += strconv.Itoa(id) + ","
+	}
+	industrialIds = strings.TrimRight(industrialIds, ",")
+	articleList, err := models.GetReportIndustrialReadNumList(userId, industrialIds)
 	mapHistroyindustrialId := make(map[int]int)
 	for _, v := range articleList {
-		mapHistroyindustrialId[v.IndustrialManagementId] = v.ReadNum
+		mapHistroyindustrialId[v.IndustrialManagementId] = v.Readnum
 	}
 	nowTime := time.Now().Local()
 	threeMonBefore := nowTime.AddDate(0, -3, 0)