|
@@ -4,6 +4,7 @@ import (
|
|
|
"eta/eta_api/controllers"
|
|
|
"eta/eta_api/models"
|
|
|
"eta/eta_api/models/data_manage"
|
|
|
+ "eta/eta_api/models/data_manage/excel"
|
|
|
"eta/eta_api/models/fe_calendar"
|
|
|
"eta/eta_api/models/sandbox"
|
|
|
"eta/eta_api/services/data"
|
|
@@ -38,7 +39,7 @@ func (c *EdbInfoRelationController) RelationEdbList() {
|
|
|
}()
|
|
|
|
|
|
source, _ := c.GetInt("Source")
|
|
|
- edbInfoType, _ := c.GetInt("edbInfoType")
|
|
|
+ edbInfoType, _ := c.GetInt("EdbInfoType")
|
|
|
classifyId := c.GetString("ClassifyId")
|
|
|
sysUserId := c.GetString("SysUserId")
|
|
|
frequency := c.GetString("Frequency")
|
|
@@ -194,6 +195,48 @@ func (c *EdbInfoRelationController) RelationEdbListDetail() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 查询表格名称
|
|
|
+ if len(tableInfoIds) > 0 {
|
|
|
+ cond := " AND excel_info_id in (" + utils.GetOrmInReplace(len(tableInfoIds)) + ")"
|
|
|
+ pars := make([]interface{}, 0)
|
|
|
+ pars = append(pars, tableInfoIds)
|
|
|
+ tableList, err := excel.GetNoContentExcelInfoListByConditionNoPage(cond, pars)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取表格数据失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ // 查询父级名称
|
|
|
+ excelParentName := make(map[int]string)
|
|
|
+ parentIds := make([]int, 0)
|
|
|
+ for _, v := range tableList {
|
|
|
+ if v.ParentId > 0 {
|
|
|
+ parentIds = append(parentIds, v.ParentId)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if len(parentIds) > 0 {
|
|
|
+ cond = " AND excel_info_id in (" + utils.GetOrmInReplace(len(parentIds)) + ")"
|
|
|
+ pars = make([]interface{}, 0)
|
|
|
+ pars = append(pars, tableInfoIds)
|
|
|
+ parentList, err := excel.GetNoContentExcelInfoListByConditionNoPage(cond, pars)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取表格数据失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ for _, v := range parentList {
|
|
|
+ excelParentName[v.ExcelInfoId] = v.ExcelName
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for _, v := range tableList {
|
|
|
+ if v.ParentId > 0 {
|
|
|
+ parentName := excelParentName[v.ParentId]
|
|
|
+ objectNameMap[v.ExcelInfoId] = fmt.Sprintf("%s_%s", parentName, v.ExcelName)
|
|
|
+ } else {
|
|
|
+ objectNameMap[v.ExcelInfoId] = v.ExcelName
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
for _, v := range relationList {
|
|
|
referObjectName, _ := objectNameMap[v.ReferObjectId]
|
|
|
tmp := &data_manage.EdbInfoRelationDetail{
|