feat:完善项目信息

This commit is contained in:
henry
2022-01-19 16:03:47 +08:00
parent 417d7961ec
commit 6adf1381d0
9 changed files with 271 additions and 25 deletions

View File

@ -8,7 +8,6 @@ import (
"SciencesServer/app/session"
"SciencesServer/utils"
"errors"
"strings"
"time"
)
@ -72,13 +71,16 @@ func (c *Expert) Instance(tenantID uint64, name string, examineStatus int, page,
for _, v := range out {
_industrys := make([]string, 0)
for _, v := range strings.Split(v.Industry, ";") {
for _, v := range mManageExpert.GetIndustryAttribute() {
_industrys = append(_industrys, config.GetIndustryInfo(v, "-", "/"))
}
// 研究机构,实验室
list = append(list, &ExpertInstance{ID: v.GetEncodeID(), Name: v.Name, Industrys: _industrys,
ResearchName: v.ResearchName, LaboratoryName: v.LaboratoryName, ExamineStatus: v.ExamineStatus,
Address: v.FormatBasic(), CreatedAt: v.CreatedAt, Area: v.FormatBasic(),
Address: v.FormatBasic(), CreatedAt: v.CreatedAt, Area: (&model2.Area{
Province: v.TenantProvince,
City: v.TenantCity,
}).FormatBasic(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil