Merge branch 'ETA_2.1.6' into debug

# Conflicts:
#	models/data_manage/chart_info.go

controllers/data_manage/chart_info.go

@@ -4576,7 +4576,6 @@ func (this *ChartInfoController) ChartList() {
 	condition += ` AND source = ? `
 	pars = append(pars, utils.CHART_SOURCE_DEFAULT)
 
-
 	if len(chartClassifyIds) > 0 {
 		if !subClassify {
 			chartClassifyId, err := data_manage.GetChartClassifyByIdsNoSubClassify(chartClassifyIds)
@@ -4585,7 +4584,7 @@ func (this *ChartInfoController) ChartList() {
 				br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 				return
 			}
-			condition += " AND chart_classify_id IN(" + chartClassifyId+ ") "
+			condition += " AND chart_classify_id IN(" + chartClassifyId + ") "
 			//pars = append(pars, chartClassifyId)
 		} else {
 			chartClassifyId, err := data_manage.GetChartClassifyByIds(chartClassifyIds)
@@ -4726,6 +4725,19 @@ func (this *ChartInfoController) ChartList() {
 			}
 		}
 	}
+
+	listTmp, err := data_manage.GetChartTypeList()
+	if err != nil {
+		br.Msg = "获取图表类型失败"
+		br.ErrMsg = "获取图表类型失败，Err:" + err.Error()
+		return
+	}
+	//遍历list，将id和name组成map
+	chartTypeMap := make(map[int]data_manage.ChartType)
+	for _, v := range listTmp {
+		chartTypeMap[v.ChartTypeId] = v
+	}
+
 	for i := 0; i < listLen; i++ {
 		//判断是否需要展示英文标识
 		if edbTmpList, ok := chartEdbMap[list[i].ChartInfoId]; ok {
@@ -4737,6 +4749,8 @@ func (this *ChartInfoController) ChartList() {
 			list[i].MyChartId = existItem.MyChartId
 			list[i].MyChartClassifyId = existItem.MyChartClassifyId
 		}
+		list[i].ChartTypeName = chartTypeMap[list[i].ChartType].ChartTypeName
+		list[i].ChartTypeNameEn = chartTypeMap[list[i].ChartType].ChartTypeNameEn
 	}
 
 	resp := new(data_manage.ChartListResp)
@@ -4824,7 +4838,7 @@ func (this *ChartInfoController) ModifyChartList() {
 					br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 					return
 				}
-				condition += " AND chart_classify_id IN(" + chartClassifyId+ ") "
+				condition += " AND chart_classify_id IN(" + chartClassifyId + ") "
 				//pars = append(pars, chartClassifyId)
 			} else {
 				chartClassifyId, err := data_manage.GetChartClassifyByIds(chartClassifyIds)

models/data_manage/chart_info.go

@@ -2000,6 +2000,8 @@ type ChartInfoView struct {
 	ForumChartInfoId  int             `description:"社区的图表ID"`
 	ChartAlias        string          `description:"图表别名"`
 	DateTypeNum       int             `description:"date_type=25(N月前)时的N值,其他类型N值可复用此字段"`
+	ChartTypeName     string          `description:"图表类型名称"`
+	ChartTypeNameEn     string          `description:"英文图表类型名称"`
 }
 
 type ChartViewButton struct {
@@ -2919,13 +2921,12 @@ type ModifyChartListReq struct {
 	SubClassify      bool `description:"是否关联图表子分类"`
 	ChartClassifyIds string
 	SysUserIds       string
-	KeyWord        string
+	KeyWord          string
 	ChartInfoIds     string `description:"图表ID"`
 	ChartClassifyId  int    `description:"新图表分类"`
 	ChartTypeIds     string
 }
 
-
 func GetChartInfoItemsByCondition(condition string, pars []interface{}) (item []*ChartInfo, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM chart_info WHERE 1=1 `
@@ -2942,4 +2943,4 @@ func UpdateChartClassifyIdByChartInfoId(chartInfoIds []int, classifyId int) (err
 	sql := ` update chart_info set chart_classify_id = ? WHERE chart_info_id in (` + utils.GetOrmInReplace(len(chartInfoIds)) + `) `
 	_, err = o.Raw(sql, classifyId, chartInfoIds).Exec()
 	return
-}
+}