fix:参数缺失

controllers/target.go

@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"github.com/shopspring/decimal"
 	"github.com/tealeg/xlsx"
 )
 
@@ -3261,77 +3262,11 @@ func (this *TargetController) ExcelDataAdd() {
 			secName := secNameList[i]
 			frequency := frequencyList[i]
 
-<<<<<<< HEAD
 			//防止填了指标名称后没填单位报错
 			if len(unitList) < len(secNameList) {
 				br.Msg = "单位填写异常！"
 				br.ErrMsg = "单位填写异常！"
 				return
-=======
-	userId := sysUser.AdminId
-	//超管账号可以查看分类下的所有频度数据
-	if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
-		userId = 0
-	}
-	//获取账户所拥有权限的分类id集合
-	classifyIdStrList, err := data.GetEdbClassifyListByAdminId(int64(userId))
-	if err != nil {
-		br.Msg = "获取分类数据失败"
-		return
-	}
-	IsVaild := 0
-	for _, classifyId := range classifyIdStrList {
-		if strconv.Itoa(req.ClassifyId) == classifyId {
-			IsVaild += 1
-		}
-		if strconv.Itoa(req.OldClassifyId) == classifyId {
-			IsVaild += 1
-		}
-	}
-	if IsVaild != 2 {
-		br.Msg = "操作权限不足，请检查分类操作权限"
-		br.ErrMsg = "操作权限不足"
-		return
-	}
-
-	// 获取当前类所有的有效指标
-	list, err := models.GetTargetItemListSort(req.ClassifyId, 1, req.Frequence, "", "", classifyIdStrList)
-	if err != nil {
-		br.Msg = "获取指标失败"
-		br.ErrMsg = "获取有效指标失败，系统错误，Err:" + err.Error()
-		return
-	}
-
-	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)
-		if err != nil {
-			br.Msg = "获取指标失败"
-			br.ErrMsg = "获取有效指标失败，系统错误，Err:" + err.Error()
-			return
-		}
-		for _, item := range oldList {
-			edbCodeInfoMap[item.SecName] = item
-			oldEdbCodeInfoMap[item.SecName] = item
-		}
-	} else {
-		// 如果没有更换指标类别和频度，那就保持一致
-		oldEdbCodeInfoMap = edbCodeInfoMap
-	}
-
-	// 删除历史类别下的指标及数据
-	if req.TradeCode == "" {
-		// TradeCode == "" 表示当前数据不是经过搜索的数据，可以进行删除指标操作
-		deleteTraceCodeList := make([]string, 0)
-		for k, v := range oldEdbCodeInfoMap {
-			if _, ok := secNameToDateMap[k]; !ok {
-				deleteTraceCodeList = append(deleteTraceCodeList, v.TradeCode)
->>>>>>> af56c8e905bfdf8dc91849158656a801cc75c47b
 			}
 			unit := unitList[i]
 
@@ -3381,7 +3316,7 @@ func (this *TargetController) ExcelDataAdd() {
 								//	continue
 								//}
 
-								tmpErr := data.AddEdbInfo(secName, unit, frequency, "", sysUser.Mobile, req.ClassifyId, sysUser.AdminId)
+								tmpErr := data.AddEdbInfo(secName, unit, frequency, "", sysUser.Mobile, req.ClassifyId, sysUser.AdminId, sysUser.RealName)
 								if tmpErr != nil {
 									//fmt.Println("AddEdbInfo err:", err.Error())
 									utils.FileLogData.Error("AddEdbInfo err :%s", tmpErr.Error())