fix:统计分析/统计特征的标准差、百分位图表时间范围与曲线图一致

controller/chart/chart_common.go

@@ -488,7 +488,8 @@ func getLineFeatureChartInfoDetailFromUniqueCode(chartInfo *chartInfoModel.Chart
 			errMsg = "格式化配置项失败，Err:" + tmpErr.Error()
 			return
 		}
-		edbList, resultResp, sourceArr, err, msg = line_feature.GetStandardDeviationData(0, edbMapping, calculateValue)
+		startDate, endDate := utils.GetDateByDateType(chartInfo.DateType, chartInfo.StartDate, chartInfo.EndDate)
+		edbList, resultResp, sourceArr, err, msg = line_feature.GetStandardDeviationData(0, startDate, endDate, edbMapping, calculateValue)
 	case utils.CHART_SOURCE_LINE_FEATURE_PERCENTILE:
 		var percentileConfig request.Percentile
 		err = json.Unmarshal([]byte(chartInfo.ExtraConfig), &percentileConfig)
@@ -497,7 +498,8 @@ func getLineFeatureChartInfoDetailFromUniqueCode(chartInfo *chartInfoModel.Chart
 			errMsg = "格式化配置项失败，Err:" + err.Error()
 			return
 		}
-		edbList, resultResp, sourceArr, err, msg = line_feature.GetPercentileData(0, edbMapping, percentileConfig.CalculateValue, percentileConfig.CalculateUnit)
+		startDate, endDate := utils.GetDateByDateType(chartInfo.DateType, chartInfo.StartDate, chartInfo.EndDate)
+		edbList, resultResp, sourceArr, err, msg = line_feature.GetPercentileData(0, startDate, endDate, edbMapping, percentileConfig.CalculateValue, percentileConfig.CalculateUnit)
 	case utils.CHART_SOURCE_LINE_FEATURE_FREQUENCY:
 		var frequencyDistributionConfig request.FrequencyDistribution
 		err = json.Unmarshal([]byte(chartInfo.ExtraConfig), &frequencyDistributionConfig)

services/chart/line_feature/chart_info.go

@@ -56,11 +56,11 @@ type FrequencyDistributionYData struct {
 }
 
 // GetStandardDeviationData 获取标准差图表的指标数据
-func GetStandardDeviationData(chartInfoId int, mappingInfo *chartEdbMappingModel.ChartEdbInfoMapping, calculateValue int) (edbList []*chartEdbMappingModel.ChartEdbInfoMappingList, dataResp LineFeatureDataResp, sourceArr []string, err error, errMsg string) {
+func GetStandardDeviationData(chartInfoId int, startDate, endDate string, mappingInfo *chartEdbMappingModel.ChartEdbInfoMapping, calculateValue int) (edbList []*chartEdbMappingModel.ChartEdbInfoMappingList, dataResp LineFeatureDataResp, sourceArr []string, err error, errMsg string) {
 	edbList = make([]*chartEdbMappingModel.ChartEdbInfoMappingList, 0)
 
 	// 指标对应的所有数据
-	_, edbList, sourceArr, err = chart.GetEdbDataMapList(chartInfoId, 1, `公历`, ``, ``, []*chartEdbMappingModel.ChartEdbInfoMapping{mappingInfo})
+	_, edbList, sourceArr, err = chart.GetEdbDataMapList(chartInfoId, 1, `公历`, startDate, endDate, []*chartEdbMappingModel.ChartEdbInfoMapping{mappingInfo})
 	if err != nil {
 		return
 	}
@@ -123,7 +123,7 @@ func GetStandardDeviationData(chartInfoId int, mappingInfo *chartEdbMappingModel
 }
 
 // GetPercentileData 获取百分位图表的指标数据
-func GetPercentileData(chartInfoId int, mappingInfo *chartEdbMappingModel.ChartEdbInfoMapping, calculateValue int, calculateUnit string) (edbList []*chartEdbMappingModel.ChartEdbInfoMappingList, dataResp LineFeatureDataResp, sourceArr []string, err error, errMsg string) {
+func GetPercentileData(chartInfoId int, startDate, endDate string, mappingInfo *chartEdbMappingModel.ChartEdbInfoMapping, calculateValue int, calculateUnit string) (edbList []*chartEdbMappingModel.ChartEdbInfoMappingList, dataResp LineFeatureDataResp, sourceArr []string, err error, errMsg string) {
 	edbList = make([]*chartEdbMappingModel.ChartEdbInfoMappingList, 0)
 	moveUnitDays, ok := utils.FrequencyDaysMap[calculateUnit]
 	if !ok {
@@ -133,7 +133,7 @@ func GetPercentileData(chartInfoId int, mappingInfo *chartEdbMappingModel.ChartE
 	}
 	calculateDay := calculateValue * moveUnitDays
 	// 指标对应的所有数据
-	_, edbList, sourceArr, err = chart.GetEdbDataMapList(chartInfoId, 1, `公历`, ``, ``, []*chartEdbMappingModel.ChartEdbInfoMapping{mappingInfo})
+	_, edbList, sourceArr, err = chart.GetEdbDataMapList(chartInfoId, 1, `公历`, startDate, endDate, []*chartEdbMappingModel.ChartEdbInfoMapping{mappingInfo})
 	if err != nil {
 		return
 	}