Merge branch 'cygx/cygx_need_959' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/report_selection.go

@@ -123,7 +123,7 @@ func (this *ReportSelectionController) PreserveAndPublish() {
 		item.IndustrialSubjectId = v.IndustrialSubjectId
 		item.SubjectName = v.IndustrialSubjectName
 		item.IndustrialManagementId = v.IndustrialManagementId
-		item.IndustrialManagementNames = v.IndustrialManagementName
+		item.IndustrialManagementNames = v.IndustrialManagementNames
 		item.OverviewArticleId = v.OverviewArticleId
 		item.IsNew = v.IsNew
 		item.IsShowOverviewArticle = v.IsShowOverviewArticle
@@ -1015,12 +1015,12 @@ func (this *ReportSelectionController) History() {
 		br.ErrMsg = "GetCygxReportSelectionSubjectHistoryList，Err:" + err.Error()
 		return
 	}
-	mapSubjectHistory := make(map[string]int) // 标的点击数量
-	industrialHistory := make(map[string]int) // 产业点击数量
+	mapSubjectHistory := make(map[string]int)    // 标的点击数量
+	mapIndustrialHistory := make(map[string]int) // 产业点击数量
 	for _, v := range listSelectionSubjectHistory {
 		mapSubjectHistory[v.IndustrialSubjectId]++
 		if v.IndustrialSubjectId == "0" && v.IndustrialManagementId > 0 {
-			industrialHistory[strconv.Itoa(v.IndustrialManagementId)]++
+			mapIndustrialHistory[strconv.Itoa(v.IndustrialManagementId)]++
 		}
 	}
 
@@ -1033,7 +1033,7 @@ func (this *ReportSelectionController) History() {
 				item := new(cygx.HistoryReportSelectionLogResp)
 				if (v2.IndustrialSubjectId == "" || v2.IndustrialSubjectId == "0") && v2.IndustrialManagementId != "" {
 					item.SubjectName = v2.IndustrialManagementNames
-					item.Count = mapSubjectHistory[v2.IndustrialSubjectId]
+					item.Count = mapIndustrialHistory[v2.IndustrialManagementId]
 				} else {
 					item.SubjectName = v2.SubjectName
 					item.IndustrialSubjectId = v2.IndustrialSubjectId

models/cygx/report_selection_log.go

@@ -32,18 +32,19 @@ type CygxReportSelectionLogRep struct {
 }
 
 type AddCygxReportSelectionLog struct {
-	ChartPermissionId        int      `description:"行业ID"`
-	IndustrialSubjectId      string   `description:"标的ID"`
-	SubjectName              string   `description:"标的名称"`
-	IndustrialSubjectName    string   `description:"标的ID"`
-	Body                     string   `description:"内容"`
-	IndustrialManagementId   string   `description:"产业资源包Id  多个用 , 隔开"`
-	IndustrialManagementName string   `description:"产业资源包Id  多个用 , 隔开"`
-	CompanyLabel             []string `description:"公司标签"`
-	Label                    string   `description:"公司标签"`
-	OverviewArticleId        int      `description:"综述报告Id"`
-	IsNew                    int      `description:"是否为New标签"`
-	IsShowOverviewArticle    int      `description:"是否展示综述报告 1展示，0隐藏"`
+	ChartPermissionId         int      `description:"行业ID"`
+	IndustrialSubjectId       string   `description:"标的ID"`
+	SubjectName               string   `description:"标的名称"`
+	IndustrialSubjectName     string   `description:"标的ID"`
+	Body                      string   `description:"内容"`
+	IndustrialManagementId    string   `description:"产业资源包Id  多个用 , 隔开"`
+	IndustrialManagementName  string   `description:"产业资源包Id  多个用 , 隔开"`
+	IndustrialManagementNames string   `description:"产业资源包Id  多个用 , 隔开"`
+	CompanyLabel              []string `description:"公司标签"`
+	Label                     string   `description:"公司标签"`
+	OverviewArticleId         int      `description:"综述报告Id"`
+	IsNew                     int      `description:"是否为New标签"`
+	IsShowOverviewArticle     int      `description:"是否展示综述报告 1展示，0隐藏"`
 }
 
 type CygxReportSelectionLogResp struct {
@@ -116,7 +117,6 @@ func GetReportSelectionlogListAll(articleId int) (items []*CygxReportSelectionLo
 	sql := `SELECT  l.* 
 			FROM
 			cygx_report_selection_log AS l
-			INNER JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = l.industrial_subject_id 
 			WHERE l.article_id = ? `
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return