|
@@ -15,11 +15,11 @@ import (
|
|
|
)
|
|
|
|
|
|
// GetStandardDeviationData 获取标准差图表的指标数据
|
|
|
-func GetStandardDeviationData(chartInfoId int, mappingInfo *data_manage.ChartEdbInfoMapping, calculateValue int) (edbList []*data_manage.ChartEdbInfoMapping, dataResp response.LineFeatureDataResp, err error, errMsg string) {
|
|
|
+func GetStandardDeviationData(chartInfoId int, startDate, endDate string, mappingInfo *data_manage.ChartEdbInfoMapping, calculateValue int) (edbList []*data_manage.ChartEdbInfoMapping, dataResp response.LineFeatureDataResp, err error, errMsg string) {
|
|
|
edbList = make([]*data_manage.ChartEdbInfoMapping, 0)
|
|
|
|
|
|
// 指标对应的所有数据
|
|
|
- _, edbList, err = data.GetEdbDataMapList(chartInfoId, 1, `公历`, ``, ``, []*data_manage.ChartEdbInfoMapping{mappingInfo})
|
|
|
+ _, edbList, err = data.GetEdbDataMapList(chartInfoId, 1, `公历`, startDate, endDate, []*data_manage.ChartEdbInfoMapping{mappingInfo})
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
@@ -82,7 +82,7 @@ func GetStandardDeviationData(chartInfoId int, mappingInfo *data_manage.ChartEdb
|
|
|
}
|
|
|
|
|
|
// GetPercentileData 获取百分位图表的指标数据
|
|
|
-func GetPercentileData(chartInfoId int, mappingInfo *data_manage.ChartEdbInfoMapping, calculateValue int, calculateUnit string) (edbList []*data_manage.ChartEdbInfoMapping, dataResp response.LineFeatureDataResp, err error, errMsg string) {
|
|
|
+func GetPercentileData(chartInfoId int, startDate, endDate string, mappingInfo *data_manage.ChartEdbInfoMapping, calculateValue int, calculateUnit string) (edbList []*data_manage.ChartEdbInfoMapping, dataResp response.LineFeatureDataResp, err error, errMsg string) {
|
|
|
edbList = make([]*data_manage.ChartEdbInfoMapping, 0)
|
|
|
moveUnitDays, ok := utils.FrequencyDaysMap[calculateUnit]
|
|
|
if !ok {
|
|
@@ -92,7 +92,7 @@ func GetPercentileData(chartInfoId int, mappingInfo *data_manage.ChartEdbInfoMap
|
|
|
}
|
|
|
calculateDay := calculateValue * moveUnitDays
|
|
|
// 指标对应的所有数据
|
|
|
- _, edbList, err = data.GetEdbDataMapList(chartInfoId, 1, `公历`, ``, ``, []*data_manage.ChartEdbInfoMapping{mappingInfo})
|
|
|
+ _, edbList, err = data.GetEdbDataMapList(chartInfoId, 1, `公历`, startDate, endDate, []*data_manage.ChartEdbInfoMapping{mappingInfo})
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|