fix

services/data/edb_info.go

@@ -40,15 +40,19 @@ func EdbInfoRefreshAllFromBase(edbInfoIdList []int, refreshAll bool) (err error,
 		//开始时间
 		startDate = ``
 		if refreshAll { //刷新所有数据，用开始时间作为起始日期去刷新
-			sTime, err := time.Parse(utils.FormatDate, bv.StartDate)
-			if err != nil {
-				return err
+			sTime, tmpErr := time.Parse(utils.FormatDate, bv.StartDate)
+			if tmpErr != nil {
+				err = tmpErr
+				errmsg = err.Error()
+				return
 			}
 			startDate = sTime.Format(utils.FormatDate)
 		} else {
-			sTime, err := time.Parse(utils.FormatDate, bv.EndDate)
-			if err != nil {
-				return err
+			sTime, tmpErr := time.Parse(utils.FormatDate, bv.EndDate)
+			if tmpErr != nil {
+				err = tmpErr
+				errmsg = err.Error()
+				return
 			}
 			frequency := bv.Frequency
 			var limitDay int
@@ -68,16 +72,18 @@ func EdbInfoRefreshAllFromBase(edbInfoIdList []int, refreshAll bool) (err error,
 			}
 			startDate = sTime.AddDate(0, 0, -limitDay).Format(utils.FormatDate)
 		}
-		result, err := RefreshEdbData(bv.EdbInfoId, bv.Source, bv.EdbCode, startDate)
-		if err != nil {
+		result, tmpErr := RefreshEdbData(bv.EdbInfoId, bv.Source, bv.EdbCode, startDate)
+		if tmpErr != nil {
+			err = tmpErr
 			fmt.Println(bv.EdbInfoId, "RefreshBaseEdbData err", time.Now())
-			errmsg = "RefreshBaseEdbData Err:" + err.Error()
-			return err
+			errmsg = "RefreshBaseEdbData Err:" + tmpErr.Error()
+			return
 		}
 		if result.Ret != 200 {
 			fmt.Println(bv.EdbInfoId, "RefreshBaseEdbData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
 			errmsg = fmt.Sprint(bv.EdbInfoId, "RefreshBaseEdbData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
-			return fmt.Errorf("刷新失败, err:", errmsg)
+			err = fmt.Errorf("刷新失败, err:", errmsg)
+			return
 		}
 
 		//maxAndMinItem, err := data_manage.GetEdbInfoMaxAndMinInfo(source, edbCode)
@@ -100,7 +106,7 @@ func EdbInfoRefreshAllFromBase(edbInfoIdList []int, refreshAll bool) (err error,
 	for _, v := range calculateArr {
 		edbInfo := newCalculateMap[v]
 		if edbInfo == nil {
-			return err
+			return
 		}
 		startDate = edbInfo.StartDate
 		source := edbInfo.Source
@@ -112,9 +118,11 @@ func EdbInfoRefreshAllFromBase(edbInfoIdList []int, refreshAll bool) (err error,
 				if refreshAll { //刷新所有数据，用开始时间作为起始日期去刷新
 					startDate = edbInfo.StartDate
 				} else {
-					sTime, err := time.Parse(utils.FormatDate, edbInfo.EndDate)
-					if err != nil {
-						return err
+					sTime, tmpErr := time.Parse(utils.FormatDate, edbInfo.EndDate)
+					if tmpErr != nil {
+						err = tmpErr
+						errmsg = tmpErr.Error()
+						return
 					}
 					frequency := edbInfo.Frequency
 					var limitDay int
@@ -137,16 +145,18 @@ func EdbInfoRefreshAllFromBase(edbInfoIdList []int, refreshAll bool) (err error,
 			}
 		}
 
-		result, err := RefreshEdbCalculateData(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
-		if err != nil {
+		result, tmpErr := RefreshEdbCalculateData(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
+		if tmpErr != nil {
+			err = tmpErr
 			fmt.Println(v, "RefreshEdbCalculateData err", time.Now())
-			errmsg = "RefreshEdbCalculateData Err:" + err.Error()
-			return err
+			errmsg = "RefreshEdbCalculateData Err:" + tmpErr.Error()
+			return
 		}
 		if result.Ret != 200 {
 			fmt.Println(v, "RefreshEdbCalculateData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
 			errmsg = fmt.Sprint(v, "RefreshEdbCalculateData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
-			return fmt.Errorf("刷新失败")
+			err = fmt.Errorf("刷新失败")
+			return
 		}
 	}
 
@@ -154,7 +164,7 @@ func EdbInfoRefreshAllFromBase(edbInfoIdList []int, refreshAll bool) (err error,
 	for _, v := range predictCalculateArr {
 		edbInfo := newPredictCalculateMap[v]
 		if edbInfo == nil {
-			return err
+			return
 		}
 		startDate = edbInfo.StartDate
 		source := edbInfo.Source
@@ -166,9 +176,11 @@ func EdbInfoRefreshAllFromBase(edbInfoIdList []int, refreshAll bool) (err error,
 				if refreshAll { //刷新所有数据，用开始时间作为起始日期去刷新
 					startDate = edbInfo.StartDate
 				} else {
-					sTime, err := time.Parse(utils.FormatDate, edbInfo.EndDate)
-					if err != nil {
-						return err
+					sTime, tmpErr := time.Parse(utils.FormatDate, edbInfo.EndDate)
+					if tmpErr != nil {
+						err = tmpErr
+						errmsg = tmpErr.Error()
+						return
 					}
 					frequency := edbInfo.Frequency
 					var limitDay int
@@ -191,19 +203,21 @@ func EdbInfoRefreshAllFromBase(edbInfoIdList []int, refreshAll bool) (err error,
 			}
 		}
 
-		result, err := RefreshPredictEdbCalculateData(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
-		if err != nil {
+		result, tmpErr := RefreshPredictEdbCalculateData(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
+		if tmpErr != nil {
+			err = tmpErr
 			fmt.Println(v, "RefreshPredictEdbCalculateData err", time.Now())
-			errmsg = "RefreshPredictEdbCalculateData Err:" + err.Error()
-			return err
+			errmsg = "RefreshPredictEdbCalculateData Err:" + tmpErr.Error()
+			return
 		}
 		if result.Ret != 200 {
 			fmt.Println(v, "RefreshPredictEdbCalculateData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
 			errmsg = fmt.Sprint(v, "RefreshPredictEdbCalculateData err;msg:", result.Msg, ";errMsg:", result.ErrMsg)
-			return fmt.Errorf("刷新失败")
+			err = fmt.Errorf("刷新失败")
+			return
 		}
 	}
-	return err
+	return
 }
 
 // getRefreshEdbInfoList 获取待更新的指标（普通基础指标、普通运算指标，预测运算指标）