fix

controllers/base_from_calculate.go

@@ -617,10 +617,10 @@ func (this *CalculateController) BatchSave() {
 		condition += " AND edb_info_id =? "
 		pars = append(pars, fromEdbInfoId)
 		condition += " AND value <=0 "
-		checkCount, err := models.GetEdbDataCount(condition, pars, fromEdbInfo.Source)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		checkCount, tmpErr := models.GetEdbDataCount(condition, pars, fromEdbInfo.Source)
+		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
 			br.Msg = "判断环比值是否可计算失败"
-			br.ErrMsg = "判断环比值是否可计算失败,Err:" + err.Error()
+			br.ErrMsg = "判断环比值是否可计算失败,Err:" + tmpErr.Error()
 			return
 		}
 		if checkCount > 0 {
@@ -654,10 +654,10 @@ func (this *CalculateController) BatchSave() {
 		}
 
 		secondEdbInfoReq := req.EdbInfoIdArr[0]
-		secondEdbInfo, err := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
-		if err != nil {
+		secondEdbInfo, tmpErr := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
+		if tmpErr != nil {
 			br.Msg = "获取拼接日期之后的指标信息失败"
-			br.ErrMsg = "获取拼接日期之后的指标信息失败:Err:" + err.Error()
+			br.ErrMsg = "获取拼接日期之后的指标信息失败:Err:" + tmpErr.Error()
 			return
 		}
 
@@ -682,10 +682,10 @@ func (this *CalculateController) BatchSave() {
 		}
 
 		secondEdbInfoReq := req.EdbInfoIdArr[0]
-		tbzEdbInfo, err := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
-		if err != nil {
+		tbzEdbInfo, tmpErr := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
+		if tmpErr != nil {
 			br.Msg = "获取同比值指标信息失败"
-			br.ErrMsg = "获取同比值指标信息失败:Err:" + err.Error()
+			br.ErrMsg = "获取同比值指标信息失败:Err:" + tmpErr.Error()
 			return
 		}
 		if tbzEdbInfo.Source != utils.DATA_SOURCE_CALCULATE_TBZ {
@@ -712,10 +712,10 @@ func (this *CalculateController) BatchSave() {
 		sourName = "拟合残差"
 
 		secondEdbInfoReq := req.EdbInfoIdArr[1]
-		secondEdbInfo, err := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
-		if err != nil {
+		secondEdbInfo, tmpErr := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
+		if tmpErr != nil {
 			br.Msg = "获取因变量的指标信息失败"
-			br.ErrMsg = "获取因变量的指标信息失败:Err:" + err.Error()
+			br.ErrMsg = "获取因变量的指标信息失败:Err:" + tmpErr.Error()
 			return
 		}
 
@@ -967,10 +967,10 @@ func (this *CalculateController) BatchEdit() {
 		condition += " AND edb_info_id =? "
 		pars = append(pars, req.FromEdbInfoId)
 		condition += " AND value <=0 "
-		checkCount, err := models.GetEdbDataCount(condition, pars, fromEdbInfo.Source)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		checkCount, tmpErr := models.GetEdbDataCount(condition, pars, fromEdbInfo.Source)
+		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
 			br.Msg = "判断环比值是否可计算失败"
-			br.ErrMsg = "判断环比值是否可计算失败,Err:" + err.Error()
+			br.ErrMsg = "判断环比值是否可计算失败,Err:" + tmpErr.Error()
 			return
 		}
 		if checkCount > 0 {
@@ -999,10 +999,10 @@ func (this *CalculateController) BatchEdit() {
 		}
 
 		secondEdbInfoReq := req.EdbInfoIdArr[0]
-		secondEdbInfo, err := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
-		if err != nil {
+		secondEdbInfo, tmpErr := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
+		if tmpErr != nil {
 			br.Msg = "获取拼接日期之后的指标信息失败"
-			br.ErrMsg = "获取拼接日期之后的指标信息失败:Err:" + err.Error()
+			br.ErrMsg = "获取拼接日期之后的指标信息失败:Err:" + tmpErr.Error()
 			return
 		}
 
@@ -1027,10 +1027,10 @@ func (this *CalculateController) BatchEdit() {
 		}
 
 		secondEdbInfoReq := req.EdbInfoIdArr[0]
-		tbzEdbInfo, err := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
-		if err != nil {
+		tbzEdbInfo, tmpErr := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
+		if tmpErr != nil {
 			br.Msg = "获取同比值指标信息失败"
-			br.ErrMsg = "获取同比值指标信息失败:Err:" + err.Error()
+			br.ErrMsg = "获取同比值指标信息失败:Err:" + tmpErr.Error()
 			return
 		}
 		if tbzEdbInfo.Source != utils.DATA_SOURCE_CALCULATE_TBZ {
@@ -1056,10 +1056,10 @@ func (this *CalculateController) BatchEdit() {
 	case utils.DATA_SOURCE_CALCULATE_NHCC:
 		sourName = "拟合残差"
 		secondEdbInfoReq := req.EdbInfoIdArr[1]
-		secondEdbInfo, err := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
-		if err != nil {
+		secondEdbInfo, tmpErr := models.GetEdbInfoById(secondEdbInfoReq.EdbInfoId)
+		if tmpErr != nil {
 			br.Msg = "获取因变量的指标信息失败"
-			br.ErrMsg = "获取因变量的指标信息失败:Err:" + err.Error()
+			br.ErrMsg = "获取因变量的指标信息失败:Err:" + tmpErr.Error()
 			return
 		}