修复预测数据

services/data/predict_edb_info_rule.go

@@ -1613,7 +1613,6 @@ func GetChartPredictEdbInfoDataListByRuleDynamicYOYComparisonOrDifference(ruleTy
 			if replaceValue, replaceOk := getReplaceValue(existMap, 35, 1,-1, preDate); !replaceOk {
 				continue
 			} else {
-				fmt.Println(replaceValue)
 				baseDynamicDataList[preDateStr] = replaceValue
 				predictDayList = append(predictDayList, date)
 			}
@@ -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)
+		var 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