fix：新增拟合残差计算指标

models/edb_data_calculate_nhcc.go

@@ -434,7 +434,7 @@ func refreshAllCalculateNhcc(to orm.TxOrmer, edbInfo *EdbInfo, existItemA, exist
 		pars = make([]interface{}, 0)
 
 		condition += "  AND edb_info_id = ? "
-		pars = append(pars, edbInfo.CalculateFormula, existItemB.FromEdbInfoId)
+		pars = append(pars, existItemB.FromEdbInfoId)
 
 		//第二个指标的数据列表
 		secondDataList, tmpErr := GetEdbDataListAllByTo(to, condition, pars, existItemB.FromSource, 0)
@@ -448,16 +448,16 @@ func refreshAllCalculateNhcc(to orm.TxOrmer, edbInfo *EdbInfo, existItemA, exist
 	var a, b float64
 	{
 		coordinateData := make([]Coordinate, 0)
-		for i := nhccDate.StartDate; i.Before(nhccDate.EndDate) || i.Equal(nhccDate.EndDate); i.AddDate(0, 0, 1) {
+		for i := nhccDate.StartDate; i.Before(nhccDate.EndDate) || i.Equal(nhccDate.EndDate); i = i.AddDate(0, 0, 1) {
 			dateStr := i.Format(utils.FormatDate)
 			xValue, ok := aDataMap[dateStr]
 			if !ok {
-				err = errors.New("指标A日期：" + dateStr + "数据异常，导致计算线性方程是失败")
+				err = errors.New("指标A日期：" + dateStr + "数据异常，导致计算线性方程公式失败")
 				return
 			}
 			yValue, ok := bDataMap[dateStr]
 			if !ok {
-				err = errors.New("指标B日期：" + dateStr + "数据异常，导致计算线性方程是失败")
+				err = errors.New("指标B日期：" + dateStr + "数据异常，导致计算线性方程公式失败")
 				return
 			}
 			tmpCoordinate := Coordinate{
@@ -531,7 +531,7 @@ func refreshAllCalculateNhcc(to orm.TxOrmer, edbInfo *EdbInfo, existItemA, exist
 		}
 	}
 
-	//删除已经不存在的累计同比拼接指标数据（由于同比值当日的数据删除了）
+	//删除已经不存在的拟合残差指标数据（由于该指标当日的数据删除了）
 	{
 		removeDateList := make([]string, 0)
 		for dateTime := range removeDataTimeMap {
@@ -565,7 +565,7 @@ func refreshAllCalculateNhcc(to orm.TxOrmer, edbInfo *EdbInfo, existItemA, exist
 func handleNhccData(dataList []*EdbInfoSearchData, moveDay int) (newDataList []EdbInfoSearchData, dateDataMap map[string]float64) {
 	dateMap := make(map[time.Time]float64)
 	var minDate, maxDate time.Time
-	//dateList := make([]string, 0)
+	dateDataMap = make(map[string]float64)
 
 	for _, v := range dataList {
 		currDate, _ := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)