4.0.1优化部分

controllers/activity.go

@@ -1628,7 +1628,7 @@ func (this *ActivityCoAntroller) LabelList() {
 	//	pageSize = utils.PageSize20
 	//}
 	//currentIndex = 1
-	pageSize = 16
+	pageSize = 15
 	//startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
 	var sortTime string

controllers/report.go

@@ -701,19 +701,51 @@ func (this *ReportController) IndustryListByDepartment() {
 			subjectNamesNew = strings.TrimRight(subjectNamesNew, "/")
 			artList[k2].SubjectName = subjectNamesNew
 			artList[k2].DepartmentId = v.DepartmentId
-			artList[k2].IndustryName = industryName + "-" + subjectNamesNew
+			if subjectNamesNew == "" {
+				artList[k2].IndustryName = industryName
+			} else {
+				artList[k2].IndustryName = industryName + "-" + subjectNamesNew
+			}
+			if artList[k2].IsReport == "1" {
+				artList[k2].IndustryName = "【观点】" + artList[k2].IndustryName
+			} else {
+				artList[k2].IndustryName = "【纪要】" + artList[k2].IndustryName
+			}
+
 		}
 		list[k].List = artList
 		if v.FollowNum > 0 {
 			list[k].IsMyFollow = true
 		}
 	}
-	resp.ListnNew, err = models.GetIndustrialSubjectByDepartmentNew()
+	listnNew, err := models.GetIndustrialSubjectByDepartmentNew()
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
+
+	if len(listnNew) > 0 {
+		for _, v := range listnNew {
+			Management := new(models.IndustrialManagementIdInt)
+			//fmt.Println(v)
+			if v.SubjectNames != "" {
+				var subjectNamesNew string
+				slice := strings.Split(v.SubjectNames, ",")
+				for k1, v1 := range slice {
+					if k1 < 4 && k1 < len(slice)-1 {
+						subjectNamesNew += v1 + "/"
+					}
+				}
+				subjectNamesNew = strings.TrimRight(subjectNamesNew, "/")
+				Management.IndustryName = subjectNamesNew
+			} else {
+				Management.IndustryName = v.IndustryName
+			}
+			Management.IndustrialManagementId = v.IndustrialManagementId
+			resp.ListnNew = append(resp.ListnNew, Management)
+		}
+	}
 	resp.List = list
 	resp.Paging = page
 	br.Ret = 200
@@ -903,7 +935,7 @@ func (this *ReportController) ReportList() {
 		return
 	}
 	page = paging.GetPaging(currentIndex, pageSize, total)
-	condition += ` AND art.is_report =1 	GROUP BY art.article_id ORDER BY art.publish_date DESC`
+	condition += `  GROUP BY art.article_id ORDER BY art.publish_date DESC`
 	list, err := models.IndustrialToArticleWhichDepartment(condition, pars, uid, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"

models/article_department.go

@@ -113,7 +113,7 @@ func GetIndustrialSubjectByDepartment(departmentId int) (items []*IndustrialMana
 }
 
 //最新产业列表
-func GetIndustrialSubjectByDepartmentNew() (items []*IndustrialManagementIdInt, err error) {
+func GetIndustrialSubjectByDepartmentNew() (items []*IndustrialManagementIdInts, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT m.*, MAX( a.publish_date ) art_time
 			FROM
@@ -185,7 +185,7 @@ func GetIndustrialSubjectNewListByDepartmentId(departmentId, industrialManagemen
 //最新标的列表
 func GetArticleByDepartmentId(departmentId int) (items []*IndustrialManagementIdName, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT article_id,	MAX( publish_date ) art_time  FROM cygx_article WHERE department_id = ? AND  publish_status = 1 AND subject_ids != '' GROUP  BY subject_ids  ORDER BY art_time DESC  LIMIT 4 `
+	sql := `SELECT article_id,is_report,MAX( publish_date ) art_time  FROM cygx_article WHERE department_id = ? AND  publish_status = 1 AND subject_ids != '' GROUP  BY subject_ids  ORDER BY art_time DESC  LIMIT 4 `
 	_, err = o.Raw(sql, departmentId).QueryRows(&items)
 	return
 }

models/industrial_management.go

@@ -224,11 +224,18 @@ type IndustrialManagementIdInt struct {
 	SubjectName            string `description:"标的名称"`
 }
 
+type IndustrialManagementIdInts struct {
+	IndustrialManagementId int    `description:"产业Id"`
+	IndustryName           string `description:"产业名称"`
+	SubjectNames           string `description:"标的名称"`
+}
+
 type IndustrialManagementIdName struct {
 	DepartmentId int    `description:"作者ID"`
 	ArticleId    int    `description:"文章id"`
 	IndustryName string `description:"产业名称"`
 	SubjectName  string `description:"标的名称"`
+	IsReport     string `description:"1观点，0纪要"`
 }
 
 //获取归类产业报告数量大于10的