feat：完善项目信息

app/api/website/controller/manage/expert.go

@@ -0,0 +1,98 @@
+package manage
+
+import (
+	"SciencesServer/app/api/website/model"
+	"SciencesServer/app/basic/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+	"strings"
+)
+
+type Expert struct {
+	*session.Enterprise
+}
+
+type ExpertHandle func(session *session.Enterprise) *Expert
+
+type (
+	// ExpertBasicInfo 基本信息
+	ExpertBasicInfo struct {
+		ID           string   `json:"id"`
+		Name         string   `json:"name"`
+		School       string   `json:"school"`
+		Major        string   `json:"major"`
+		Industrys    []string `json:"industrys"`
+		Keywords     []string `json:"keywords"`
+		PatentTitles []string `json:"patent_titles"`
+	}
+	// ExpertInstanceInfo 专家信息
+	ExpertInstanceInfo struct {
+		ExpertBasicInfo
+		Researchs []string `json:"researchs"`
+		Introduce string   `json:"introduce"`
+	}
+	// ExpertAchievementInfo 专家成果信息
+	ExpertAchievementInfo struct {
+		*model.TechnologyAchievementInfo
+		ChargeInfo *model2.TechnologyAchievementChargeInfo `json:"charge_info"`
+	}
+)
+
+// Instance 专家信息
+func (c *Expert) Instance(id uint64) (*ExpertInstanceInfo, error) {
+	mManageExpert := model.NewManageExpert()
+	out, err := mManageExpert.Detail(3, id)
+
+	if err != nil {
+		return nil, err
+	}
+	return &ExpertInstanceInfo{
+		ExpertBasicInfo: ExpertBasicInfo{
+			ID:           out.GetEncodeID(),
+			Name:         out.Name,
+			School:       out.School,
+			Major:        out.Major,
+			Industrys:    out.GetIndustryAttribute(),
+			Keywords:     out.GetKeywordAttribute(),
+			PatentTitles: strings.Split(out.PatentTitle, "&&"),
+		},
+		Researchs: out.GetResearchAttribute(),
+		Introduce: out.Introduce,
+	}, nil
+}
+
+func (c *Expert) Achievement(id uint64, page, pageSize int) (*controller.ReturnPages, error) {
+	// 查询专家身份下用户信息
+	mUserExpert := model.NewUserExpert()
+
+	uids := make([]*uint64, 0)
+
+	err := model2.Pluck(mUserExpert.UserExpert, "uid", &uids, model2.NewWhere("expert_id", id))
+
+	if err != nil {
+		return nil, err
+	}
+	mTechnologyAchievement := model.NewTechnologyAchievement()
+	var count int64
+
+	out := make([]*model.TechnologyAchievementInfo, 0)
+
+	if out, err = mTechnologyAchievement.Achievement(page, pageSize, &count, model2.NewWhereIn("uid", uids)); err != nil {
+		return nil, err
+	}
+	list := make([]*ExpertAchievementInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &ExpertAchievementInfo{
+			TechnologyAchievementInfo: v,
+			ChargeInfo:                v.GetChargeInfoAttribute(),
+		})
+	}
+	return &controller.ReturnPages{Data: list, Count: count}, nil
+}
+
+func NewExpert() ExpertHandle {
+	return func(session *session.Enterprise) *Expert {
+		return &Expert{session}
+	}
+}

app/api/website/controller/manage/search.go

@@ -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) {