作者产业下的标的排序

controllers/report.go

@@ -113,6 +113,7 @@ func (this *ReportController) IndustryList() {
 	if currentIndex <= 0 {
 		currentIndex = 1
 	}
+
 	startSize = paging.StartIndex(currentIndex, pageSize)
 	if isNewLabel == "1" {
 		condition += ` AND is_new_label = ` + isNewLabel
@@ -159,23 +160,28 @@ func (this *ReportController) IndustryList() {
 		condition += ` AND man.chart_permission_id IN (` + strconv.Itoa(ChartPermissionId) + `)`
 	}
 
-	var total int
+	//var total int
 	var list []*models.IndustrialManagement
-	totalTopList, errTop := models.GetIndustrialManagemenCountTop(sqlChartPermissionId, uid, condition)
-	totalTop := len(totalTopList)
-	if errTop != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取品种信息失败,Err:" + errTop.Error()
-		return
-	}
-	totalNoTopList, errNoTop := models.GetIndustrialManagemenCountNoTop(sqlChartPermissionId, uid, condition)
-	totalNoTop := len(totalNoTopList)
-	if errNoTop != nil {
+	//totalTopList, errTop := models.GetIndustrialManagemenCountTop(sqlChartPermissionId, uid, condition)
+	//totalTop := len(totalTopList)
+	//if errTop != nil {
+	//	br.Msg = "获取信息失败"
+	//	br.ErrMsg = "获取品种信息失败,Err:" + errTop.Error()
+	//	return
+	//}
+	//totalNoTopList, errNoTop := models.GetIndustrialManagemenCountNoTop(sqlChartPermissionId, uid, condition)
+	//totalNoTop := len(totalNoTopList)
+	//if errNoTop != nil {
+	//	br.Msg = "获取信息失败"
+	//	br.ErrMsg = "获取品种信息失败,Err:" + errNoTop.Error()
+	//	return
+	//}
+	total, err := models.GetIndustrialManagementAllCount(condition)
+	if err != nil {
 		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取品种信息失败,Err:" + errNoTop.Error()
+		br.ErrMsg = "获取数量失败,Err:" + err.Error()
 		return
 	}
-	total = totalTop + totalNoTop
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	if orderColumn == "" {
 		orderColumn = "NewTime"
@@ -224,6 +230,10 @@ func (this *ReportController) IndustryList() {
 	//	}
 	//	list = append(listTop, listNoTop...)
 	//}
+
+	if ChartPermissionId == 0 {
+		ChartPermissionId = 20
+	}
 	detailHot3, err := models.GetIndustrialManagementHot3(ChartPermissionId)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -657,15 +667,18 @@ func (this *ReportController) IndustryListByDepartment() {
 			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 			return
 		}
-
 		for k2, v2 := range listDepar {
-			if v2.SubjectName != "" {
-				slice := strings.Split(v2.SubjectName, "/")
+			condition := ` AND  mg.industrial_management_id =  ` + strconv.Itoa(v2.IndustrialManagementId)
+			listSubject, err := models.GetIndustrialSubjectNewList(condition)
+			if err != nil {
+				br.Msg = "获取失败" + strconv.Itoa(v2.IndustrialManagementId)
+				br.ErrMsg = "获取失败，Err:" + err.Error()
+				return
+			}
+			if len(listSubject) > 0 {
 				listDepar[k2].SubjectName = ""
-				for k3, v3 := range slice {
-					if k3 < 4 {
-						listDepar[k2].SubjectName += v3 + "/"
-					}
+				for _, v3 := range listSubject {
+					listDepar[k2].SubjectName += v3.SubjectName + "/"
 				}
 				listDepar[k2].SubjectName = strings.TrimRight(listDepar[k2].SubjectName, "/")
 			}
@@ -855,14 +868,21 @@ func (this *ReportController) ReportList() {
 			list[k].IsRed = true
 		}
 		list[k].IsResearch = true
-		slice := strings.Split(v.SubjectName, "/")
-		list[k].SubjectName = ""
-		for k2, v2 := range slice {
-			if k2 < 4 {
-				list[k].SubjectName += v2 + "/"
+		condition := ` AND  art.article_id =  ` + strconv.Itoa(v.ArticleId)
+		listSubject, err := models.GetIndustrialSubjectNewList(condition)
+		if err != nil {
+			br.Msg = "获取失败" + strconv.Itoa(v.ArticleId)
+			br.ErrMsg = "获取失败，Err:" + err.Error()
+			return
+		}
+		fmt.Println(len(listSubject))
+		if len(listSubject) > 0 {
+			list[k].SubjectName = ""
+			for _, v3 := range listSubject {
+				list[k].SubjectName += v3.SubjectName + "/"
 			}
+			list[k].SubjectName = strings.TrimRight(list[k].SubjectName, "/")
 		}
-		list[k].SubjectName = strings.TrimRight(list[k].SubjectName, "/")
 		if list[k].SubjectName != "" {
 			list[k].IndustryName += "-" + list[k].SubjectName
 		}

models/article_department.go

@@ -129,3 +129,27 @@ func GetDepartmentCount(departmentId int) (count int, err error) {
 	err = o.Raw(sqlCount, departmentId).QueryRow(&count)
 	return
 }
+
+type IndustrialSubjectList struct {
+	SubjectName string `description:"标的名称"`
+}
+
+//最新标的列表
+func GetIndustrialSubjectNewList(condition string) (items []*IndustrialSubjectList, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT s.*
+			FROM
+				cygx_industrial_subject AS s
+				INNER JOIN cygx_industrial_article_group_subject AS sg ON sg.industrial_subject_id = s.industrial_subject_id
+				INNER JOIN cygx_article AS art ON art.article_id = sg.article_id
+				INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = art.article_id
+			WHERE
+				1 = 1 
+				AND art.publish_status = 1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY s.create_time DESC LIMIT 4`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}

models/industrial_management.go

@@ -51,7 +51,7 @@ func GetIndustrialManagemenCountNoTop(sqlChartPermissionId string, uid int, cond
 	return
 }
 
-//产业列表 不置顶
+//产业列表
 func GetIndustrialManagementAll(uid int, condition, orderSrt string, startSize, pageSize int) (items []*IndustrialManagement, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -64,18 +64,35 @@ func GetIndustrialManagementAll(uid int, condition, orderSrt string, startSize,
 			INNER JOIN cygx_report_mapping AS re ON re.chart_permission_id = man.chart_permission_id
 			INNER JOIN cygx_industrial_article_group_management AS man_g ON man_g.industrial_management_id = man.industrial_management_id
 			INNER JOIN cygx_article AS art ON art.article_id = man_g.article_id 
-			WHERE 1= 1 
-			AND man.industrial_management_id NOT IN ( SELECT industrial_management_id FROM cygx_industry_top WHERE user_id = ` + strconv.Itoa(uid) + ` ) 
+			WHERE 1= 1
 			AND re.report_type = 2 
 			AND art.is_report = 1
 			AND art.is_class = 1 ` + condition + `
 			GROUP BY
 			man.industry_name 
 			ORDER BY ` + orderSrt + ` LIMIT ?,?`
+	//AND man.industrial_management_id NOT IN ( SELECT industrial_management_id FROM cygx_industry_top WHERE user_id = ` + strconv.Itoa(uid) + ` )
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
 
+//产业列表
+func GetIndustrialManagementAllCount(condition string) (count int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT  COUNT(*) count
+			FROM
+			cygx_industrial_management AS man
+			INNER JOIN cygx_report_mapping AS re ON re.chart_permission_id = man.chart_permission_id
+			INNER JOIN cygx_industrial_article_group_management AS man_g ON man_g.industrial_management_id = man.industrial_management_id
+			INNER JOIN cygx_article AS art ON art.article_id = man_g.article_id 
+			WHERE 1= 1
+			AND re.report_type = 2 
+			AND art.is_report = 1
+			AND art.is_class = 1 ` + condition + ``
+	err = o.Raw(sql).QueryRow(&count)
+	return
+}
+
 //产业列表 -置顶
 func GetIndustrialManagementTopAll(uid int, condition string, startSize, pageSize int) (items []*IndustrialManagement, err error) {
 	o := orm.NewOrm()

services/task.go

@@ -3,7 +3,6 @@ package services
 import (
 	"fmt"
 	"github.com/PuerkitoBio/goquery"
-	//"github.com/beego/beego/v2/adapter/toolbox"
 	"github.com/beego/beego/v2/task"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
@@ -11,7 +10,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-	//"github.com/beego/beego/v2/adapter/cache"
 )
 
 func Task() {
@@ -24,8 +22,6 @@ func Task() {
 		getSummarytoEs := task.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
 		task.AddTask("getSummarytoEs", getSummarytoEs)
 	}
-
-	//UpdateActivitySattus()
 	//修改任务状态
 	updateActivitySattus := task.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
 	task.AddTask("updateActivitySattus", updateActivitySattus)

utils/config.go

@@ -96,7 +96,7 @@ func init() {
 		EmailStrategy = "xfma@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jhwang@hzinsights.com"                                           //策略行业专家邮箱
 		EmaiWhiteUserList = "tshen@hzinsights.com;cxzhang@hzinsights.com;yyli@hzinsights.com"                                                             //白名单邮箱
 		WxMsgTemplateIdAskMsg = "PaoDanHGlt1kFw5q-4_ipJSwO3FyZpxSSNg4rwB7YCk"
-		WxMsgTemplateIdAskMsgMobile = "15557270714"
+		WxMsgTemplateIdAskMsgMobile = "15557270714,17634786714"
 
 	} else {
 		WxAppId = "wxcc32b61f96720d2f"
@@ -122,7 +122,7 @@ func init() {
 		EmailStrategy = "jhwang@hzinsights.com;cxzhang@hzinsights.com"    //策略行业专家邮箱
 		EmaiWhiteUserList = "cxzhang@hzinsights.com"
 		WxMsgTemplateIdAskMsg = "qfNuops-sKrfIkbA7U97A7gSrX03mUpoEpJksRUdloo"
-		WxMsgTemplateIdAskMsgMobile = "15557270714"
+		WxMsgTemplateIdAskMsgMobile = "15557270714,17634786714"
 	}
 }