Merge branch 'bzq1/execl-edit' of eta_server/eta_api into debug

controllers/target.go

@@ -4077,6 +4077,8 @@ func (this *TargetController) ExcelDataAdd() {
 	for _, item := range list {
 		edbCodeInfoMap[item.SecName] = item
 	}
+	//历史的类别下的指标
+	oldEdbCodeInfoMap := make(map[string]*models.EdbInfoItem)
 	if req.ClassifyId != req.OldClassifyId || req.Frequence != req.OldFrequence {
 		// 获取历史类所有的有效指标
 		oldList, err := models.GetTargetItemListSort(req.OldClassifyId, 1, req.OldFrequence, "", "", classifyIdStrList)
@@ -4087,13 +4089,15 @@ func (this *TargetController) ExcelDataAdd() {
 		}
 		for _, item := range oldList {
 			edbCodeInfoMap[item.SecName] = item
+			oldEdbCodeInfoMap[item.SecName] = item
 		}
 	}
 
+	// 删除历史类别下的指标及数据
 	if req.TradeCode == "" {
 		// TradeCode == "" 表示当前数据不是经过搜索的数据，可以进行删除指标操作
 		deleteTraceCodeList := make([]string, 0)
-		for k, v := range edbCodeInfoMap {
+		for k, v := range oldEdbCodeInfoMap {
 			if _, ok := secNameToDateMap[k]; !ok {
 				deleteTraceCodeList = append(deleteTraceCodeList, v.TradeCode)
 			}