|
@@ -6,6 +6,7 @@ import (
|
|
|
"eta/eta_bridge/models/response"
|
|
|
"eta/eta_bridge/services/alarm_msg"
|
|
|
"fmt"
|
|
|
+ "strconv"
|
|
|
"strings"
|
|
|
)
|
|
|
|
|
@@ -19,10 +20,17 @@ func GetIndexFromJiaYue(indexCode string, sourceArr []string) (data *response.In
|
|
|
}
|
|
|
}()
|
|
|
|
|
|
- // 指标存在无编码情况, 用自增ID查
|
|
|
- indexCond := ` (ID = :1 OR SOURCE_CODE = :1)`
|
|
|
+ indexCond := ``
|
|
|
indexPars := make([]interface{}, 0)
|
|
|
- indexPars = append(indexPars, indexCode, indexCode)
|
|
|
+ // 指标存在无编码情况, 尝试转换indexCode为int查自增ID
|
|
|
+ indexId, e := strconv.Atoi(indexCode)
|
|
|
+ if e == nil && indexId > 0 {
|
|
|
+ indexCond = ` (ID = :1 OR SOURCE_CODE = :1)`
|
|
|
+ indexPars = append(indexPars, indexId, indexCode)
|
|
|
+ } else {
|
|
|
+ indexCond = ` SOURCE_CODE = :1`
|
|
|
+ indexPars = append(indexPars, indexCode)
|
|
|
+ }
|
|
|
if len(sourceArr) > 0 {
|
|
|
indexCond += ` AND SOURCE_TYPE IN (:1)`
|
|
|
indexPars = append(indexPars, sourceArr)
|
|
@@ -65,13 +73,16 @@ func GetIndexAndDataFromJiaYue(indexCode, startDate, endDate string, sourceArr [
|
|
|
}
|
|
|
}()
|
|
|
|
|
|
- // 指标存在无编码情况, 用自增ID查
|
|
|
- indexCond := ` (ID = :1 OR SOURCE_CODE = :1)`
|
|
|
+ indexCond := ``
|
|
|
indexPars := make([]interface{}, 0)
|
|
|
- indexPars = append(indexPars, indexCode, indexCode)
|
|
|
- if len(sourceArr) > 0 {
|
|
|
- indexCond += ` AND SOURCE_TYPE IN (:1)`
|
|
|
- indexPars = append(indexPars, sourceArr)
|
|
|
+ // 指标存在无编码情况, 尝试转换indexCode为int查自增ID
|
|
|
+ indexId, e := strconv.Atoi(indexCode)
|
|
|
+ if e == nil && indexId > 0 {
|
|
|
+ indexCond = ` (ID = :1 OR SOURCE_CODE = :1)`
|
|
|
+ indexPars = append(indexPars, indexId, indexCode)
|
|
|
+ } else {
|
|
|
+ indexCond = ` SOURCE_CODE = :1`
|
|
|
+ indexPars = append(indexPars, indexCode)
|
|
|
}
|
|
|
|
|
|
indexes, e := jiayue.GetDictIndex(indexCond, indexPars)
|