Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/tactics.go

@@ -130,7 +130,9 @@ func (this *TacticsController) List() {
 		//	condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
 		//}
 
-		if detail.PolymerizationId != "" {
+		if detail.CeLueFieldId != "" {
+			condition = ` AND ce_lue_field_id IN(` + detail.CeLueFieldId + `)`
+		} else if detail.PolymerizationId != "" {
 			condition = ` AND category_id IN(` + detail.PolymerizationId + `)`
 		} else {
 			condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`

models/article.go

@@ -46,6 +46,7 @@ type CygxArticle struct {
 	Annotation       string `description:"核心观点"`
 	TypeName         string `description:"策略平台报告类型"`
 	ModifyTimeByCl   string `description:"策略平台报告更新时间"`
+	CeLueFieldId     int    `description:"策略平台领域ID"`
 }
 
 type CygxArticleEs struct {

models/chart.go

@@ -174,7 +174,7 @@ func GetChartList(condition string, pars []interface{}, startSize, pageSize int)
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` ORDER BY create_date DESC LIMIT ?,? `
+	sql += ` ORDER BY chart_id DESC LIMIT ?,? `
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

models/report_mapping.go

@@ -14,6 +14,7 @@ type ReportMapping struct {
 	IsRed               bool   `description:"是否标红"`
 	PermissionType      int    `description:"1主观，2客观"`
 	PolymerizationId    string `description:"分类聚合ID"`
+	CeLueFieldId        string `description:"策略平台领域ID"`
 }
 
 type ReportMappingHome struct {

models/tactics.go

@@ -83,6 +83,7 @@ type Tactics2 struct {
 	File            string    `description:"Pdf下载链接"`
 	TypeName        string    `description:"策略平台报告类型"`
 	UpdateDate      string    `description:"策略平台报告更新时间"`
+	CeLueFieldId    int       `description:"策略平台领域ID"`
 }
 
 func GetTacticsList2(endDate string) (list []*Tactics2, err error) {

services/article.go

@@ -806,6 +806,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 		item.FieldName = articleResult.Field.Name
 		item.TypeName = articleResult.Type.Name
 		item.UpdateDate = articleResult.UpdateDate
+		item.CeLueFieldId = articleResult.Field.Id
 		list = append(list, item)
 		itemAuthor.ArticleId = articleResult.ArticleId
 		itemAuthor.Name = articleResult.Author.Name
@@ -991,6 +992,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 			updateParams["Annotation"] = v.Annotation
 			updateParams["TypeName"] = v.TypeName
 			updateParams["ModifyTimeByCl"] = v.UpdateDate
+			updateParams["CeLueFieldId"] = v.CeLueFieldId
 			whereParam := map[string]interface{}{"article_id": v.ArticleId}
 			err = models.UpdateByExpr(models.CygxArticle{}, whereParam, updateParams)
 			if err != nil {
@@ -1033,6 +1035,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 			item.Annotation = v.Annotation
 			item.TypeName = v.TypeName
 			item.ModifyTimeByCl = v.UpdateDate
+			item.CeLueFieldId = v.CeLueFieldId
 			newId, err := models.AddCygxArticles(item)
 			if err != nil {
 				fmt.Println("AddCygxArticle Err:", err.Error())