feat:完善项目信息

This commit is contained in:
henry
2021-12-24 15:28:46 +08:00
parent f654b0a4f0
commit b506378003
9 changed files with 241 additions and 15 deletions

View File

@ -36,8 +36,35 @@ type (
*model.TechnologyAchievementInfo
ChargeInfo *model2.TechnologyAchievementChargeInfo `json:"charge_info"`
}
// ExpertProjectInfo 专家项目信息
ExpertProjectInfo struct {
ID string `json:"id"`
*model2.TechnologyProject
}
// ExpertPatentInfo 专利信息
ExpertPatentInfo struct {
ID string `json:"id"`
*model.PatentInfo
}
// ExpertPaperInfo 论文信息
ExpertPaperInfo struct {
ID string `json:"id"`
*model2.TechnologyPaper
Keywords []string `json:"keywords"`
}
)
func (c *Expert) user(id uint64) ([]uint64, error) {
mUserExpert := model.NewUserExpert()
uids := make([]uint64, 0)
err := model2.Pluck(mUserExpert.UserExpert, "uid", &uids, model2.NewWhere("expert_id", id))
return uids, err
}
// Instance 专家信息
func (c *Expert) Instance(id uint64) (*ExpertInstanceInfo, error) {
mManageExpert := model.NewManageExpert()
@ -61,18 +88,15 @@ func (c *Expert) Instance(id uint64) (*ExpertInstanceInfo, error) {
}, nil
}
// Achievement 成果信息
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))
uids, err := c.user(id)
if err != nil {
return nil, err
}
mTechnologyAchievement := model.NewTechnologyAchievement()
var count int64
out := make([]*model.TechnologyAchievementInfo, 0)
@ -91,6 +115,99 @@ func (c *Expert) Achievement(id uint64, page, pageSize int) (*controller.ReturnP
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Project 项目信息
func (c *Expert) Project(id uint64, page, pageSize int) (*controller.ReturnPages, error) {
// 查询专家身份下用户信息
uids, err := c.user(id)
if err != nil {
return nil, err
}
mTechnologyProject := model.NewTechnologyProject()
out := make([]*model2.TechnologyProject, 0)
var count int64
if err = model2.Pages(mTechnologyProject.TechnologyProject, &out, page, pageSize, &count,
&model2.ModelWhereOrder{
Where: model2.NewWhereIn("uid", uids),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}, &model2.ModelWhereOrder{
Where: model2.NewWhere("shelf_status", model2.ShelfStatusForUp),
}); err != nil {
return nil, err
}
list := make([]*ExpertProjectInfo, 0)
for _, v := range out {
list = append(list, &ExpertProjectInfo{
ID: v.GetEncodeID(),
TechnologyProject: v,
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Patent 专利信息
func (c *Expert) Patent(id uint64, page, pageSize int) (*controller.ReturnPages, error) {
// 查询专家身份下用户信息
uids, err := c.user(id)
if err != nil {
return nil, err
}
mUserPatent := model.NewUserPatent()
var count int64
out := make([]*model.PatentInfo, 0)
if out, err = mUserPatent.Patent(page, pageSize, &count, model2.NewWhereIn("u_p.uid", uids)); err != nil {
return nil, err
}
list := make([]*ExpertPatentInfo, 0)
for _, v := range out {
list = append(list, &ExpertPatentInfo{
ID: v.GetEncodeID(),
PatentInfo: v,
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Paper 论文信息
func (c *Expert) Paper(id uint64, page, pageSize int) (*controller.ReturnPages, error) {
// 查询专家身份下用户信息
uids, err := c.user(id)
if err != nil {
return nil, err
}
mTechnologyPaper := model.NewTechnologyPaper()
out := make([]*model2.TechnologyPaper, 0)
var count int64
if err = model2.PagesFields(mTechnologyPaper.TechnologyPaper, &out, []string{"id", "title", "ext", "keyword"},
page, pageSize, &count, &model2.ModelWhereOrder{
Where: model2.NewWhereIn("uid", uids),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}); err != nil {
return nil, err
}
list := make([]*ExpertPaperInfo, 0)
for _, v := range out {
list = append(list, &ExpertPaperInfo{
ID: v.GetEncodeID(),
TechnologyPaper: v,
Keywords: v.GetKeywordAttribute(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
func NewExpert() ExpertHandle {
return func(session *session.Enterprise) *Expert {
return &Expert{session}