Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into cygx_4.0

controllers/report.go

@@ -528,7 +528,20 @@ func (this *MobileReportController) List() {
 			imgUrlChart = vslice[len(vslice)-1]
 			mapCategoryUrl[categoryIdStr] = imgUrlChart
 		}
-		if detail.PolymerizationId != "" {
+
+		//condition += ` AND category_id_two=? `
+		//pars = append(pars, categoryId)
+
+		//categoryIdSet, errCategory := models.GetdetailByCategoryIdSet(categoryId)
+		//if errCategory != nil {
+		//	br.Msg = "获取信息失败"
+		//	br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在：" + strconv.Itoa(categoryId)
+		//	return
+		//}
+		//fmt.Println(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 {
 			categoryIdSet, errCategory := models.GetdetailByCategoryIdSet(categoryId)

models/report_mapping.go

@@ -15,6 +15,7 @@ type ReportMapping struct {
 	PermissionType      int    `description:"1主观，2客观"`
 	CategoryIdSet       int    `description:"分类映射id"`
 	PolymerizationId    string `description:"分类聚合ID"`
+	CeLueFieldId        string `description:"策略平台领域ID"`
 }
 
 type ReportMappingHome struct {