zhangchuanxing vor 2 Monaten
Ursprung
Commit
e8380a47bf
3 geänderte Dateien mit 4 neuen und 2 gelöschten Zeilen
  1. 2 2
      controllers/report.go
  2. 1 0
      models/report.go
  3. 1 0
      services/industrial_management.go

+ 2 - 2
controllers/report.go

@@ -3174,8 +3174,8 @@ func (this *ReportController) SearchReportAndResource() {
 		}
 	}
 
-	condition = `  AND a.publish_status = 1 AND a.article_type_id NOT IN (` + articleTypeIds + `)  AND (m.industry_name LIKE '%` + keyWord + `%' OR m.subject_names LIKE '%` + keyWord + `%'  )  `
-	//condition = `  AND a.publish_status = 1   AND (m.industry_name LIKE '%` + keyWord + `%' OR m.subject_names LIKE '%` + keyWord + `%'  )  `
+	//condition = `  AND a.publish_status = 1 AND a.article_type_id NOT IN (` + articleTypeIds + `)  AND (m.industry_name LIKE '%` + keyWord + `%' OR m.subject_names LIKE '%` + keyWord + `%'  )  `
+	condition = `  AND a.publish_status = 1   AND (m.industry_name LIKE '%` + keyWord + `%' OR m.subject_names LIKE '%` + keyWord + `%'  )  `
 
 	listHzResource, err := models.GetSearchResourceListcondition(condition, 0, pageSize)
 	if err != nil {

+ 1 - 0
models/report.go

@@ -20,6 +20,7 @@ type IndustrialManagement struct {
 	CategoryId             int                  `description:"文章分类ID"`
 	LayoutTime             string               `description:"布局时间"`
 	UpdateTime             string               `description:"更新时间"`
+	PublishDate            string               `description:"更新时间"`
 	MinReportTime          string               `description:"报告最早发布时间"`
 	IsRed                  bool                 `description:"是否标记红点"`
 	IsTop                  bool                 `description:"是否置顶"`

+ 1 - 0
services/industrial_management.go

@@ -678,6 +678,7 @@ func HandleIndustryListResource(list []*models.IndustrialManagement, user *model
 			v.IndustryVideo = videoSimple
 		}
 		v.AuthInfo = au
+		v.PublishDate = v.UpdateTime
 	}
 	if len(industrialIdArr) > 0 {
 		//合并产业关联的标的