Browse Source

no message

zhangchuanxing 3 months ago
parent
commit
3200f86412
2 changed files with 10 additions and 2 deletions
  1. 5 1
      controllers/cygx/report_selection.go
  2. 5 1
      models/cygx/report_selection_log.go

+ 5 - 1
controllers/cygx/report_selection.go

@@ -127,6 +127,8 @@ func (this *ReportSelectionController) PreserveAndPublish() {
 		if v.IndustrialManagementNames != "" {
 			item.IndustrialManagementNames = v.IndustrialManagementNames
 		}
+		item.ThirdId = v.ThirdId
+		item.ThirdName = v.ThirdName
 		item.OverviewArticleId = v.OverviewArticleId
 		item.IsNew = v.IsNew
 		item.IsShowOverviewArticle = v.IsShowOverviewArticle
@@ -422,7 +424,9 @@ func (this *ReportSelectionController) Detail() {
 				listSon[kIndustrial].IsNew = 0
 			}
 
-			if vIndustrial.SubjectName == "" {
+			if vIndustrial.ThirdName != "" {
+				listSon[kIndustrial].ShowName = vIndustrial.ThirdName
+			} else if vIndustrial.SubjectName == "" {
 				listSon[kIndustrial].ShowName = vIndustrial.IndustrialManagementNames
 			} else {
 				listSon[kIndustrial].ShowName = vIndustrial.SubjectName

+ 5 - 1
models/cygx/report_selection_log.go

@@ -19,6 +19,8 @@ type CygxReportSelectionLog struct {
 	OverviewArticleId         int       `description:"关联的综述报告ID"`
 	IsNew                     int       `description:"是否为New标签"`
 	IsShowOverviewArticle     int       `description:"是否展示综述报告 1展示,0隐藏"`
+	ThirdId                   string    `description:"类似产业、标的的三方ID"`
+	ThirdName                 string    `description:"类似产业、标的的三方名称"`
 }
 
 type CygxReportSelectionLogRep struct {
@@ -46,7 +48,7 @@ type AddCygxReportSelectionLog struct {
 	IsNew                     int      `description:"是否为New标签"`
 	IsShowOverviewArticle     int      `description:"是否展示综述报告 1展示,0隐藏"`
 	ThirdId                   string   `description:"类似产业、标的的三方ID"`
-	ThirdtName                string   `description:"类似产业、标的的三方名称"`
+	ThirdName                 string   `description:"类似产业、标的的三方名称"`
 }
 
 type CygxReportSelectionLogResp struct {
@@ -66,6 +68,8 @@ type CygxReportSelectionLogResp struct {
 	IsNew                     int      `description:"是否为New标签"`
 	IsShowOverviewArticle     int      `description:"是否展示综述报告 1展示,0隐藏"`
 	ChartPermissionSort       int      `description:"品种排序"`
+	ThirdId                   string   `description:"类似产业、标的的三方ID"`
+	ThirdName                 string   `description:"类似产业、标的的三方名称"`
 }
 
 type CygxReportSelectionChart struct {