|
|
@@ -1594,7 +1594,6 @@ func GetChartPredictEdbInfoDataListByRuleDynamicYOYComparisonOrDifference(ruleTy
|
|
|
return
|
|
|
}
|
|
|
if len(dynamicYOYComparisonIndexDataList) <= 0 {
|
|
|
- //err = errors.New(fmt.Sprintf("选择%s指标没有预测数据", yoyType))
|
|
|
return
|
|
|
} else {
|
|
|
for _, v := range dynamicYOYComparisonIndexDataList {
|
|
|
@@ -1625,16 +1624,16 @@ func GetChartPredictEdbInfoDataListByRuleDynamicYOYComparisonOrDifference(ruleTy
|
|
|
for k, currentDate := range predictDayList {
|
|
|
var calculateValue decimal.Decimal
|
|
|
var dateStr = currentDate.Format(utils.FormatDate)
|
|
|
+ preDate := currentDate.AddDate(-1, 0, 0)
|
|
|
+ preDateStr := preDate.Format(utils.FormatDate)
|
|
|
_, dynamicVal := DynamicCalculateDataList[dateStr];
|
|
|
- _, baseVal := baseDynamicDataList[dateStr];
|
|
|
+ _, baseVal := baseDynamicDataList[preDateStr];
|
|
|
if dynamicVal && baseVal{
|
|
|
switch ruleType {
|
|
|
case 17:
|
|
|
- fmt.Println(baseDynamicDataList[dateStr])
|
|
|
- fmt.Println(DynamicCalculateDataList[dateStr])
|
|
|
- calculateValue = baseDynamicDataList[dateStr].Mul(DynamicCalculateDataList[dateStr].Add(decimal.NewFromInt(1)))
|
|
|
+ calculateValue = baseDynamicDataList[preDateStr].Mul(DynamicCalculateDataList[dateStr].Add(decimal.NewFromInt(1)))
|
|
|
case 18:
|
|
|
- calculateValue = baseDynamicDataList[dateStr].Add(DynamicCalculateDataList[dateStr])
|
|
|
+ calculateValue = baseDynamicDataList[preDateStr].Add(DynamicCalculateDataList[dateStr])
|
|
|
default:
|
|
|
err = errors.New("计算规则不存在")
|
|
|
return
|
kobe6258