Merge branch 'debug' of eta_forum/eta_forum_admin into master

controllers/chart_info.go

@@ -43,7 +43,6 @@ func (this *ChartInfoController) ChartInfoDetail() {
 		return
 	}
 	chartInfoId, _ := this.GetInt("ChartInfoId")
-	edbInfoId := this.GetString("EdbInfoId")
 
 	var err error
 	chartInfo := new(models.ChartInfoView)
@@ -73,8 +72,10 @@ func (this *ChartInfoController) ChartInfoDetail() {
 	seasonEndDate := chartInfo.SeasonEndDate
 	startYear := chartInfo.StartYear
 
-	calendar := chartInfo.Calendar
-
+	calendar := this.GetString("Calendar")
+	if calendar == "" {
+		calendar = chartInfo.Calendar
+	}
 	if calendar == "" {
 		calendar = "公历"
 	}
@@ -94,23 +95,12 @@ func (this *ChartInfoController) ChartInfoDetail() {
 	resp := new(models.ChartInfoDetailResp)
 
 	mappingList := make([]*models.ChartEdbInfoMapping, 0)
-	if chartInfoId > 0 {
-		mappingList, err = models.GetChartEdbMappingList(chartInfoId)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取图表，指标信息失败，Err:" + err.Error()
-			return
-		}
-	} else {
-		if edbInfoId != "" {
-			edbInfoIds := strings.Split(edbInfoId, ",")
-			mappingList, err = models.GetChartEdbMappingListByEdbInfoId(edbInfoIds)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取图表，指标信息失败，Err:" + err.Error()
-				return
-			}
-		}
+
+	mappingList, err = models.GetChartEdbMappingList(chartInfoId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取图表，指标信息失败，Err:" + err.Error()
+		return
 	}
 
 	// 图表额外数据参数
@@ -167,6 +157,7 @@ func (this *ChartInfoController) ChartInfoDetail() {
 	if chartInfo.ChartType == 2 {
 		chartInfo.StartDate = startDate
 		chartInfo.EndDate = endDate
+		chartInfo.Calendar = calendar
 	}
 
 	// 获取图表中的指标数据
@@ -193,18 +184,6 @@ func (this *ChartInfoController) ChartInfoDetail() {
 	if len(warnEdbList) > 0 {
 		chartInfo.WarnMsg = `图表引用指标异常，异常指标：` + strings.Join(warnEdbList, "，")
 	}
-	if chartInfoId > 0 && chartInfo != nil {
-		if chartInfo.ChartType == 2 {
-			if chartInfo.SeasonStartDate != "" {
-				chartInfo.StartDate = chartInfo.SeasonStartDate
-				chartInfo.EndDate = chartInfo.SeasonEndDate
-				if chartInfo.DateType == 3 {
-					chartInfo.DateType = 5
-				}
-			}
-		}
-	}
-
 	// 图表的指标来源
 	sourceNameList, sourceNameEnList := services.GetEdbSourceByEdbInfoIdList(edbList)
 	chartInfo.ChartSource = strings.Join(sourceNameList, ",")