no message

controllers/report.go

@@ -645,6 +645,12 @@ func (this *ReportController) IndustryListByDepartment() {
 		}
 	}
 	resp := new(models.CygxArticleDepartmentList)
+	resp.ListnNew, err = models.GetIndustrialSubjectByDepartmentNew(chartPermissionId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+		return
+	}
 	resp.List = list
 	resp.Paging = page
 	br.Ret = 200

models/article_department.go

@@ -72,7 +72,7 @@ func GetCygxArticleDepartmentList(startSize, pageSize int, condition string) (it
 	return
 }
 
-//标的列表
+//产业列表
 func GetIndustrialSubjectByDepartment(departmentId int) (items []*IndustrialManagementIdInt, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -90,3 +90,21 @@ FROM
 	_, err = o.Raw(sql, departmentId).QueryRows(&items)
 	return
 }
+
+//最新产业列表
+func GetIndustrialSubjectByDepartmentNew(industrialManagementId int) (items []*IndustrialManagementIdInt, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT m.*, MAX( a.publish_date ) art_time
+			FROM
+			cygx_article_department AS d
+			INNER JOIN cygx_article AS a ON a.department_id = d.department_id
+			INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
+			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
+			WHERE 1 = 1 
+			AND m.chart_permission_id = ?
+			GROUP BY
+			m.industrial_management_id 
+			ORDER BY art_time DESC LIMIT 6 `
+	_, err = o.Raw(sql, industrialManagementId).QueryRows(&items)
+	return
+}