Merge branch 'bug/edb_code_repeat' into eta/2.0.2

# Conflicts:
#	models/edb_data_business.go
#	services/base_from_business.go

models/edb_data_business.go

@@ -553,11 +553,13 @@ func (obj Business) getEdbInfoMaxAndMinInfoByMongo(edbCode string) (item *EdbInf
 func (obj Business) UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo *EdbInfo) (err error) {
 	if utils.UseMongo {
 		edbInfoMaxAndMinInfo, tmpErr := obj.getEdbInfoMaxAndMinInfoByMongo(edbInfo.EdbCode)
-		if tmpErr != nil {
-			err = tmpErr
-			return
+		// 如果正常获取到了，那就去修改指标的最大最小值
+		if tmpErr == nil && edbInfoMaxAndMinInfo != nil {
+			err = ModifyEdbInfoMaxAndMinInfo(edbInfo.EdbInfoId, edbInfoMaxAndMinInfo)
+		} else {
+			// 清空的目的是为了避免异常返回
+			err = nil
 		}
-		err = ModifyEdbInfoMaxAndMinInfo(edbInfo.EdbInfoId, edbInfoMaxAndMinInfo)
 	} else {
 		err, _ = UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 	}

services/base_from_business.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_index_lib/services/alarm_msg"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"github.com/qiniu/qmgo"
 	"go.mongodb.org/mongo-driver/bson"
 	"strings"
 	"time"
@@ -595,6 +596,22 @@ func delBusinessIndexDataByMongo(item *models.BaseFromBusinessIndex, startDateTi
 		return
 	}
 
+	//修改最大最小日期
+	indexMaxAndMinInfo, err := item.GetEdbInfoMaxAndMinInfo(item.IndexCode)
+	// 如果有错误，且错误信息是取不到文档，那么就不修改了
+	if err != nil && !errors.Is(err, qmgo.ErrNoSuchDocuments) {
+		return
+	}
+	if err == nil && indexMaxAndMinInfo != nil {
+		e := item.ModifyIndexMaxAndMinInfo(item.IndexCode, indexMaxAndMinInfo, true)
+		if e != nil {
+			fmt.Println("ModifyIndexMaxAndMinInfo Err:" + e.Error())
+		}
+	} else {
+		// 清空的目的是为了避免异常返回
+		err = nil
+	}
+
 	return
 }