|
@@ -257,6 +257,8 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
Code: v.TradeCode,
|
|
Code: v.TradeCode,
|
|
Name: v.SecName,
|
|
Name: v.SecName,
|
|
ClassifyName: v.ClassifyName,
|
|
ClassifyName: v.ClassifyName,
|
|
|
|
+ NameEn: v.SecName,
|
|
|
|
+ ClassifyNameEn: v.ClassifyName,
|
|
CreateUserId: v.UserId,
|
|
CreateUserId: v.UserId,
|
|
CreateUserName: adminMap[v.UserId],
|
|
CreateUserName: adminMap[v.UserId],
|
|
})
|
|
})
|
|
@@ -292,6 +294,7 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
DataId: strconv.Itoa(v.BaseFromMysteelChemicalIndexId),
|
|
DataId: strconv.Itoa(v.BaseFromMysteelChemicalIndexId),
|
|
Code: v.IndexCode,
|
|
Code: v.IndexCode,
|
|
Name: v.IndexName,
|
|
Name: v.IndexName,
|
|
|
|
+ NameEn: v.IndexName,
|
|
//ClassifyName: v.,
|
|
//ClassifyName: v.,
|
|
CreateUserId: v.SysUserId,
|
|
CreateUserId: v.SysUserId,
|
|
CreateUserName: v.SysUserRealName,
|
|
CreateUserName: v.SysUserRealName,
|
|
@@ -299,8 +302,8 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
}
|
|
}
|
|
case 3, 4: //ETA指标库、ETA预测指标
|
|
case 3, 4: //ETA指标库、ETA预测指标
|
|
if keyword != `` {
|
|
if keyword != `` {
|
|
- condition += " AND (edb_code like ? OR edb_name like ? OR sys_user_real_name like ? ) "
|
|
|
|
- pars = utils.GetLikeKeywordPars(pars, keyword, 3)
|
|
|
|
|
|
+ condition += " AND (edb_code like ? OR edb_name like ? OR edb_name_en like ? OR sys_user_real_name like ? ) "
|
|
|
|
+ pars = utils.GetLikeKeywordPars(pars, keyword, 4)
|
|
}
|
|
}
|
|
if userId > 0 {
|
|
if userId > 0 {
|
|
condition += ` AND sys_user_id = ? `
|
|
condition += ` AND sys_user_id = ? `
|
|
@@ -332,6 +335,7 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
DataId: strconv.Itoa(v.EdbInfoId),
|
|
DataId: strconv.Itoa(v.EdbInfoId),
|
|
Code: v.EdbCode,
|
|
Code: v.EdbCode,
|
|
Name: v.EdbName,
|
|
Name: v.EdbName,
|
|
|
|
+ NameEn: v.EdbNameEn,
|
|
//ClassifyName: v.,
|
|
//ClassifyName: v.,
|
|
CreateUserId: v.SysUserId,
|
|
CreateUserId: v.SysUserId,
|
|
CreateUserName: v.SysUserRealName,
|
|
CreateUserName: v.SysUserRealName,
|
|
@@ -345,8 +349,8 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
|
|
|
|
// 关键字搜索
|
|
// 关键字搜索
|
|
if keyword != `` {
|
|
if keyword != `` {
|
|
- condition += " AND (chart_name like ? OR sys_user_real_name like ? ) "
|
|
|
|
- pars = utils.GetLikeKeywordPars(pars, keyword, 2)
|
|
|
|
|
|
+ condition += " AND (chart_name like ? or chart_name_en like ? OR sys_user_real_name like ? ) "
|
|
|
|
+ pars = utils.GetLikeKeywordPars(pars, keyword, 3)
|
|
}
|
|
}
|
|
if userId > 0 {
|
|
if userId > 0 {
|
|
condition += ` AND sys_user_id = ? `
|
|
condition += ` AND sys_user_id = ? `
|
|
@@ -373,8 +377,10 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
return
|
|
return
|
|
}
|
|
}
|
|
firstClassifyNameMap := make(map[int]string)
|
|
firstClassifyNameMap := make(map[int]string)
|
|
|
|
+ firstClassifyNameEnMap := make(map[int]string)
|
|
for _, v := range firstClassifyList {
|
|
for _, v := range firstClassifyList {
|
|
firstClassifyNameMap[v.ChartClassifyId] = v.ChartClassifyName
|
|
firstClassifyNameMap[v.ChartClassifyId] = v.ChartClassifyName
|
|
|
|
+ firstClassifyNameEnMap[v.ChartClassifyId] = v.ChartClassifyNameEn
|
|
}
|
|
}
|
|
secondClassList, tmpErr := data_manage.GetChartClassifyAll(1)
|
|
secondClassList, tmpErr := data_manage.GetChartClassifyAll(1)
|
|
if tmpErr != nil {
|
|
if tmpErr != nil {
|
|
@@ -382,12 +388,18 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
return
|
|
return
|
|
}
|
|
}
|
|
secondClassifyNameMap := make(map[int]string)
|
|
secondClassifyNameMap := make(map[int]string)
|
|
|
|
+ secondClassifyNameEnMap := make(map[int]string)
|
|
for _, v := range secondClassList {
|
|
for _, v := range secondClassList {
|
|
firstName := firstClassifyNameMap[v.ParentId]
|
|
firstName := firstClassifyNameMap[v.ParentId]
|
|
|
|
+ firstNameEn := firstClassifyNameEnMap[v.ParentId]
|
|
if firstName != `` {
|
|
if firstName != `` {
|
|
firstName = firstName + " / "
|
|
firstName = firstName + " / "
|
|
}
|
|
}
|
|
|
|
+ if firstNameEn != `` {
|
|
|
|
+ firstNameEn = firstNameEn + " / "
|
|
|
|
+ }
|
|
secondClassifyNameMap[v.ChartClassifyId] = firstName + v.ChartClassifyName
|
|
secondClassifyNameMap[v.ChartClassifyId] = firstName + v.ChartClassifyName
|
|
|
|
+ secondClassifyNameEnMap[v.ChartClassifyId] = firstNameEn + v.ChartClassifyNameEn
|
|
}
|
|
}
|
|
|
|
|
|
for _, v := range tmpList {
|
|
for _, v := range tmpList {
|
|
@@ -395,6 +407,8 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
DataId: strconv.Itoa(v.ChartInfoId),
|
|
DataId: strconv.Itoa(v.ChartInfoId),
|
|
Name: v.ChartName,
|
|
Name: v.ChartName,
|
|
ClassifyName: secondClassifyNameMap[v.ChartClassifyId],
|
|
ClassifyName: secondClassifyNameMap[v.ChartClassifyId],
|
|
|
|
+ NameEn: v.ChartNameEn,
|
|
|
|
+ ClassifyNameEn: secondClassifyNameEnMap[v.ChartClassifyId],
|
|
CreateUserId: v.SysUserId,
|
|
CreateUserId: v.SysUserId,
|
|
CreateUserName: v.SysUserRealName,
|
|
CreateUserName: v.SysUserRealName,
|
|
})
|
|
})
|
|
@@ -454,6 +468,8 @@ func GetMoveEdbChartList(source, subSource, userId int, keyword, classify string
|
|
DataId: strconv.Itoa(v.ExcelInfoId),
|
|
DataId: strconv.Itoa(v.ExcelInfoId),
|
|
Name: v.ExcelClassifyName,
|
|
Name: v.ExcelClassifyName,
|
|
ClassifyName: secondClassifyNameMap[v.ExcelClassifyId],
|
|
ClassifyName: secondClassifyNameMap[v.ExcelClassifyId],
|
|
|
|
+ NameEn: v.ExcelClassifyName,
|
|
|
|
+ ClassifyNameEn: secondClassifyNameMap[v.ExcelClassifyId],
|
|
CreateUserId: v.SysUserId,
|
|
CreateUserId: v.SysUserId,
|
|
CreateUserName: v.SysUserRealName,
|
|
CreateUserName: v.SysUserRealName,
|
|
})
|
|
})
|