Merge remote-tracking branch 'origin/chart/13.9' into debug

models/tables/future_good_edb_info/query.go

@@ -4,8 +4,8 @@ import "hongze/hongze_yb/global"
 
 // GetFutureGoodEdbInfoListByParentId 根据父级ID获取指标数据列表
 func GetFutureGoodEdbInfoListByParentId(parentId int) (list []*FutureGoodEdbInfo, err error) {
-	sql := `SELECT * FROM future_good_edb_info WHERE parent_id = ?  ORDER BY future_good_edb_info_id ASC `
-	err = global.MYSQL["data"].Raw(sql, parentId).Scan(&list).Error
+	sql := `SELECT * FROM future_good_edb_info WHERE parent_id = ? or  future_good_edb_info_id = ? ORDER BY future_good_edb_info_id ASC `
+	err = global.MYSQL["data"].Raw(sql, parentId, parentId).Scan(&list).Error
 
 	return
 }

services/chart/future_good/chart_info.go

@@ -403,7 +403,7 @@ func BarChartData(edbInfoMapping *chartEdbMappingModel.ChartEdbInfoMappingList,
 		mList := make([]int, 0) // 间隔月份
 		indexList := make([]int, 0)
 		if regionType == `国内` {
-			for i := currMonth; i < 12; i++ {
+			for i := currMonth + 1; i <= 12; i++ {
 				indexList = append(indexList, int(i))
 				mList = append(mList, int(i-currMonth))
 			}
@@ -597,8 +597,8 @@ func handleResultData(regionType string, yDataList []chart_info.YData, futureGoo
 				break
 			}
 			xDataList = append(xDataList, chart_info.XData{
-				Name:   fmt.Sprint("M+", i),
-				NameEn: fmt.Sprint("M+", i),
+				Name:   fmt.Sprint("M+", i+1),
+				NameEn: fmt.Sprint("M+", i+1),
 			})
 		}
 		return
@@ -703,7 +703,7 @@ func handleResultData(regionType string, yDataList []chart_info.YData, futureGoo
 		}
 	}
 
-	maxI := 100000
+	maxI := len(xDataList)
 	for _, yData := range newYDataList {
 		lenEdb := len(yData.XEdbInfoIdList)
 		for i := lenEdb - 1; i >= 0; i-- {