Merge branch 'feature/eta1.9.7_interval_analysis' into debug

models/data_manage/chart_info_range_analysis.go

@@ -280,7 +280,7 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp + "_" + strconv.Itoa(v.EdbInfoId))
 			//mapItem.MaxData = v.MaxData
 			//mapItem.MinData = v.MinData
-			mapItem.IsOrder = true
+			//mapItem.IsOrder = true
 			mapItem.EdbInfoType = 1
 			//mapItem.LeadValue = v.LeadValue
 			//mapItem.LeadUnit = v.LeadUnit

services/data/range_analysis/chart_info.go

@@ -1456,7 +1456,7 @@ func CopyChartInfo(classifyId int, chartName string, oldChartInfo *data_manage.C
 		return
 	}
 	chartInfo.ChartInfoId = int(newId)
-	edbInfoMappingList, err := data_manage.GetChartEdbMappingList(oldChartInfo.ChartInfoId)
+	edbInfoMappingList, err := data_manage.GetChartMappingList(oldChartInfo.ChartInfoId)
 	if err != nil {
 		err = fmt.Errorf("获取图表，指标信息失败，Err:" + err.Error())
 		return