Browse Source

no message

zhangchuanxing 4 months ago
parent
commit
faa678225e
2 changed files with 7 additions and 0 deletions
  1. 6 0
      controllers/report_selection.go
  2. 1 0
      models/report_selection.go

+ 6 - 0
controllers/report_selection.go

@@ -162,6 +162,11 @@ func (this *ReportSelectionController) Detail() {
 							v2.CompanyLabel = append(v2.CompanyLabel, vCompanyLabel+"#")
 						}
 					}
+					if v2.SubjectName == "" {
+						v2.ShowName = v2.IndustrialManagementNames
+					} else {
+						v2.ShowName = v2.SubjectName
+					}
 				}
 				subjectItem := new(models.ReportSelectionChartLogSubjectName)
 				subjectItem.SubjectName = v2.SubjectName
@@ -174,6 +179,7 @@ func (this *ReportSelectionController) Detail() {
 				}
 				subjectItem.Md5String = utils.MD5(fmt.Sprint("IN_ID", v2.IndustrialManagementId, "S_ID", v2.IndustrialSubjectId))
 				v2.Md5String = subjectItem.Md5String
+
 				itemSubject.ListSubject = append(itemSubject.ListSubject, subjectItem)
 				//itemSubject.ListSubject = append(itemSubject.ListSubject, &models.ReportSelectionChartLogSubjectName{SubjectName: v2.SubjectName, IsNew: v2.IsNew, IndustrialSubjectId: v2.IndustrialSubjectId})
 			}

+ 1 - 0
models/report_selection.go

@@ -88,6 +88,7 @@ type CygxReportSelectionLogDetail struct {
 	OverviewArticleId         int      `description:"综述报告Id"`
 	IsShowOverviewArticle     int      `description:"是否展示综述报告 1展示,0隐藏"`
 	Md5String                 string   `description:"Md5唯一标识"`
+	ShowName                  string   `description:"展示名称"`
 	List                      []*IndustriaReportSelection
 }
 type IndustriaReportSelection struct {