|
|
@@ -71,6 +71,9 @@ func InitCalculateIndex() {
|
|
|
edbLibIndexMethod := "/edb_info/detail"
|
|
|
var needAddIndexArr []string
|
|
|
needAddIndexMap := make(map[string]string)
|
|
|
+
|
|
|
+ edbLibIndexMap := make(map[string]int)
|
|
|
+
|
|
|
for rk, row := range rows {
|
|
|
if rk <= 0 {
|
|
|
continue
|
|
|
@@ -147,6 +150,7 @@ func InitCalculateIndex() {
|
|
|
return
|
|
|
}
|
|
|
if indexResp.Data.EdbInfoId > 0 {
|
|
|
+ edbLibIndexMap[bv.FromEdbCode] = indexResp.Data.EdbInfoId
|
|
|
total++
|
|
|
}
|
|
|
}
|
|
|
@@ -261,13 +265,16 @@ func InitCalculateIndex() {
|
|
|
return
|
|
|
}
|
|
|
for _, cv := range hzCalculateResp.Data {
|
|
|
+ //获取FromIndex
|
|
|
+ var fromEdbInfoId int
|
|
|
+ fromEdbInfoId = edbLibIndexMap[cv.FromEdbCode]
|
|
|
//新增指标信息
|
|
|
indexCalculateMap := make(map[string]interface{})
|
|
|
indexCalculateMap["EdbInfoId"] = indexBaseResp.Data.EdbInfoId
|
|
|
indexCalculateMap["Source"] = cv.Source
|
|
|
indexCalculateMap["SourceName"] = cv.SourceName
|
|
|
indexCalculateMap["EdbCode"] = cv.EdbCode
|
|
|
- indexCalculateMap["FromEdbInfoId"] = cv.FromEdbInfoId
|
|
|
+ indexCalculateMap["FromEdbInfoId"] = fromEdbInfoId
|
|
|
indexCalculateMap["FromEdbCode"] = cv.FromEdbCode
|
|
|
indexCalculateMap["FromEdbName"] = cv.FromEdbName
|
|
|
indexCalculateMap["FromSource"] = cv.FromSource
|
