|
|
@@ -62,16 +62,6 @@ func (p *publicService) List(searchValue, dataType string, pageNum, pageSize int
|
|
|
}
|
|
|
result := map[string]interface{}{}
|
|
|
result["PageCount"] = resp.PageCount
|
|
|
- wordMap := map[string]string{}
|
|
|
- wordArr := []map[string]interface{}{}
|
|
|
- for _, v := range resp.FieldIllustrate {
|
|
|
- wordArr = append(wordArr, map[string]interface{}{
|
|
|
- "code": v.Code,
|
|
|
- "Name": v.Name,
|
|
|
- "describe": v.Describe,
|
|
|
- })
|
|
|
- wordMap[v.Code] = v.Name
|
|
|
- }
|
|
|
arr := []map[string]interface{}{}
|
|
|
for _, v := range resp.List {
|
|
|
arr = append(arr, map[string]interface{}{
|
|
|
@@ -81,12 +71,10 @@ func (p *publicService) List(searchValue, dataType string, pageNum, pageSize int
|
|
|
"clearStatus": v.ClearStatus,
|
|
|
"clearStatusStr": common.If(v.ClearStatus == "0", "", "人工清洗"),
|
|
|
"dataType": v.DataType,
|
|
|
- "dataTypeStr": wordMap[v.DataType],
|
|
|
})
|
|
|
}
|
|
|
result["list"] = arr
|
|
|
- result["wordMap"] = wordMap
|
|
|
- result["fieldIllustrate"] = wordArr
|
|
|
+ result["fieldIllustrate"] = resp.FieldIllustrate
|
|
|
result["hotKeys"] = resp.HotKeys
|
|
|
return result
|
|
|
}
|
|
|
@@ -103,12 +91,12 @@ func (p *publicService) Detail(id string) map[string]interface{} {
|
|
|
}
|
|
|
result := map[string]interface{}{}
|
|
|
result["name"] = resp.Name
|
|
|
- result["dataTypeStr"] = resp.FieldIllustrate.Name
|
|
|
- result["dataType"] = resp.FieldIllustrate.Code
|
|
|
+ result["dataType"] = resp.FieldIllustrate.Name
|
|
|
result["describe"] = resp.FieldIllustrate.Describe
|
|
|
result["clearStatusStr"] = common.If(resp.ClearStatus == "0", "", "人工清洗")
|
|
|
result["clearStatus"] = resp.ClearStatus
|
|
|
result["dataExample"] = resp.DataExample
|
|
|
+ result["Introduce"] = resp.Introduce
|
|
|
result["format"] = resp.Format
|
|
|
return result
|
|
|
}
|
WH01243