feat:完善项目信息

This commit is contained in:
henry
2021-12-24 12:00:18 +08:00
parent ebf74435ef
commit f654b0a4f0
9 changed files with 248 additions and 17 deletions

View File

@ -7,6 +7,7 @@ import (
"SciencesServer/app/service"
config2 "SciencesServer/config"
"errors"
"strings"
)
type Search struct{}
@ -33,12 +34,13 @@ func company(ids []uint64) (interface{}, error) {
mManageCompany := model.NewManageCompany()
out := make([]*model2.ManageCompany, 0)
if err := model2.ScanFields(mManageCompany.ManageCompany, &out, []string{}, &model2.ModelWhereOrder{
Where: model2.NewWhereIn("id", ids),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}, &model2.ModelWhereOrder{
Where: model2.NewWhere("examine_status", model2.ExamineStatusForAgree),
}); err != nil {
if err := model2.ScanFields(mManageCompany.ManageCompany, &out, []string{"id", "kind", "name", "image", "url", "keyword"},
&model2.ModelWhereOrder{
Where: model2.NewWhereIn("id", ids),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}, &model2.ModelWhereOrder{
Where: model2.NewWhere("examine_status", model2.ExamineStatusForAgree),
}); err != nil {
return nil, err
}
list := make([]*CompanyBasicInfo, 0)
@ -54,19 +56,28 @@ func company(ids []uint64) (interface{}, error) {
return list, nil
}
// expert 专家信息
func expert(ids []uint64) (interface{}, error) {
mManageCompany := model.NewManageCompany()
out := make([]*model2.ManageCompany, 0)
mManageExpert := model.NewManageExpert()
out, err := mManageExpert.Expert(3, model2.NewWhereIn("e.id", ids))
if err := model2.ScanFields(mManageCompany.ManageCompany, &out, []string{}, &model2.ModelWhereOrder{
Where: model2.NewWhereIn("id", ids),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}, &model2.ModelWhereOrder{
Where: model2.NewWhere("examine_status", model2.ExamineStatusForAgree),
}); err != nil {
if err != nil {
return nil, err
}
return out, nil
list := make([]*ExpertBasicInfo, 0)
for _, v := range out {
list = append(list, &ExpertBasicInfo{
ID: v.GetEncodeID(),
Name: v.Name,
School: v.School,
Major: v.Major,
Industrys: v.GetIndustryAttribute(),
Keywords: v.GetKeywordAttribute(),
PatentTitles: strings.Split(v.PatentTitle, "&&"),
})
}
return list, nil
}
func research(ids []uint64) (interface{}, error) {