feat:完善项目信息

This commit is contained in:
henry
2021-12-27 10:34:06 +08:00
parent c80e581956
commit 41aa6f337c
10 changed files with 610 additions and 224 deletions

View File

@ -23,10 +23,8 @@ type (
// searchIdentityHandle 搜索信息处理
var searchIdentityHandle = map[int]func(ids []uint64) (interface{}, error){
config.TenantUserIdentityForCompany: company,
config.TenantUserIdentityForExpert: company,
config.TenantUserIdentityForResearch: company,
config.TenantUserIdentityForLaboratory: company,
config.TenantUserIdentityForAgent: company,
config.TenantUserIdentityForExpert: expert,
config.TenantUserIdentityForLaboratory: laboratory,
}
// company 公司信息
@ -67,6 +65,8 @@ func expert(ids []uint64) (interface{}, error) {
list := make([]*ExpertBasicInfo, 0)
for _, v := range out {
v.Image.Image = v.Image.Analysis(config2.SettingInfo.Domain)
list = append(list, &ExpertBasicInfo{
ID: v.GetEncodeID(),
Name: v.Name,
@ -80,32 +80,25 @@ func expert(ids []uint64) (interface{}, error) {
return list, nil
}
func research(ids []uint64) (interface{}, error) {
mManageCompany := model.NewManageCompany()
out := make([]*model2.ManageCompany, 0)
// laboratory 实验室信息
func laboratory(ids []uint64) (interface{}, error) {
mManageLaboratory := model.NewManageLaboratory()
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 {
out, err := mManageLaboratory.Laboratory(model2.NewWhereIn("id", ids))
if err != nil {
return nil, err
}
return out, nil
}
list := make([]*LaboratoryBasicInfo, 0)
func laboratory(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 {
return nil, err
for _, v := range out {
list = append(list, &LaboratoryBasicInfo{
ID: v.GetEncodeID(),
ManageLaboratoryInfo: v,
Industrys: v.GetIndustryAttribute(),
Keywords: v.GetKeywordAttribute(),
Researchs: v.GetResearchAttribute(),
})
}
return out, nil
}