feat：完善项目信息

app/api/enterprise/api/technology.go

@@ -37,7 +37,7 @@ type (
 		Ext       string   `json:"ext" form:"ext" binding:"required"`               // 格式
 		Author    string   `json:"author" form:"author" binding:"required"`         // 作者
 		PublishAt string   `json:"publish_at" form:"publish_at" binding:"required"` // 出版日期
-		Keyword   string   `json:"keyword" form:"keyword"`                          // 关键词
+		Keywords  []string `json:"keywords" form:"keywords"`                        // 关键词
 		Tags      []string `json:"tags" form:"tags"`                                // 标签
 		Remark    string   `json:"remark" form:"remark"`                            // 备注
 	}
@@ -248,7 +248,7 @@ func (a *Technology) PaperAdd(c *gin.Context) {
 	err := technology2.NewPaper()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
 		Form(&technology2.PaperParams{
 			Title: form.Title, Ext: form.Ext, Author: form.Author, PublishAt: form.PublishAt,
-			Keyword: form.Keyword, Tags: form.Tags, Remark: form.Remark,
+			Keywords: form.Keywords, Tags: form.Tags, Remark: form.Remark,
 		})
 	api.APIResponse(err)(c)
 }
@@ -265,7 +265,7 @@ func (a *Technology) PaperEdit(c *gin.Context) {
 	err := technology2.NewPaper()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
 		Form(&technology2.PaperParams{
 			ID: form.Convert(), Title: form.Title, Ext: form.Ext, Author: form.Author, PublishAt: form.PublishAt,
-			Keyword: form.Keyword, Tags: form.Tags, Remark: form.Remark,
+			Keywords: form.Keywords, Tags: form.Tags, Remark: form.Remark,
 		})
 	api.APIResponse(err)(c)
 }

app/api/enterprise/controller/technology/paper.go

@@ -26,8 +26,8 @@ type (
 	}
 	PaperParams struct {
 		ID                                    uint64
-		Title, Ext, Author, PublishAt, Keyword, Remark string
+		Title, Ext, Author, PublishAt, Remark string
-		Tags                                           []string
+		Keywords, Tags                        []string
 	}
 )
 
@@ -77,7 +77,7 @@ func (c *Paper) Form(params *PaperParams) error {
 	mTechnologyPaper.Ext = params.Ext
 	mTechnologyPaper.Author = params.Author
 	mTechnologyPaper.PublishAt = utils.DateTimeToTime(params.PublishAt)
-	mTechnologyPaper.Keyword = params.Keyword
+	mTechnologyPaper.SetKeywordAttribute(params.Keywords)
 	mTechnologyPaper.SetTagAttribute(params.Tags)
 	mTechnologyPaper.Remark = params.Remark
 

app/api/website/api/manage.go

@@ -72,3 +72,29 @@ func (*Manage) ExpertAchievement(c *gin.Context) {
 	data, err := manage.NewExpert()(nil).Achievement((&api.IDStringForm{ID: form.ExpertID}).Convert(), form.Page, form.PageSize)
 	api.APIResponse(err, data)(c)
 }
+
+func (*Manage) ExpertProject(c *gin.Context) {
+	form := &struct {
+		ExpertID string `json:"expert_id" form:"expert_id" binding:"required"`
+		api.PageForm
+	}{}
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	data, err := manage.NewExpert()(nil).Project((&api.IDStringForm{ID: form.ExpertID}).Convert(), form.Page, form.PageSize)
+	api.APIResponse(err, data)(c)
+}
+
+func (*Manage) ExpertPatent(c *gin.Context) {
+	form := &struct {
+		ExpertID string `json:"expert_id" form:"expert_id" binding:"required"`
+		api.PageForm
+	}{}
+	if err := api.Bind(form)(c); err != nil {
+		api.APIFailure(err.(error))(c)
+		return
+	}
+	data, err := manage.NewExpert()(nil).Patent((&api.IDStringForm{ID: form.ExpertID}).Convert(), form.Page, form.PageSize)
+	api.APIResponse(err, data)(c)
+}

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

@@ -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) {
-	// 查询专家身份下用户信息
+	uids, err := c.user(id)
-	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)
@@ -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}

app/api/website/model/technology_paper.go

@@ -0,0 +1,11 @@
+package model
+
+import "SciencesServer/app/common/model"
+
+type TechnologyPaper struct {
+	*model.TechnologyPaper
+}
+
+func NewTechnologyPaper() *TechnologyPaper {
+	return &TechnologyPaper{model.NewTechnologyPaper()}
+}

app/api/website/model/technology_project.go

@@ -0,0 +1,11 @@
+package model
+
+import "SciencesServer/app/common/model"
+
+type TechnologyProject struct {
+	*model.TechnologyProject
+}
+
+func NewTechnologyProject() *TechnologyProject {
+	return &TechnologyProject{model.NewTechnologyProject()}
+}

app/api/website/model/user_expert.go

@@ -1,6 +1,8 @@
 package model
 
-import "SciencesServer/app/common/model"
+import (
+	"SciencesServer/app/common/model"
+)
 
 type UserExpert struct {
 	*model.UserExpert

app/api/website/model/user_patent.go

@@ -0,0 +1,49 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+)
+
+type UserPatent struct {
+	*model.UserPatent
+}
+
+type (
+	// PatentInfo 专利信息
+	PatentInfo struct {
+		model.Model
+		Title   string `json:"title"`
+		ApplyAt string `json:"apply_at"`
+	}
+)
+
+// Patent 专利信息
+func (m *UserPatent) Patent(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*PatentInfo, error) {
+	db := orm.GetDB().Table(m.TableName()+" AS u_p").
+		Select("p.id", "p.title", "p.apply_at", "p.description").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS p ON u_p.patent_id = p.id",
+			model.NewSysPatent().TableName())).
+		Where("u_p.is_deleted = ?", model.DeleteStatusForNot).
+		Where("p.shelf_status = ?", model.ShelfStatusForUp)
+
+	if len(where) > 0 {
+		for _, wo := range where {
+			db = db.Where(wo.Condition, wo.Value)
+		}
+	}
+	out := make([]*PatentInfo, 0)
+
+	if err := db.Count(count).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Order("p.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func NewUserPatent() *UserPatent {
+	return &UserPatent{model.NewUserPatent()}
+}

app/common/model/technology_paper.go

@@ -14,7 +14,7 @@ type TechnologyPaper struct {
 	Ext       string    `gorm:"column:ext;type:varchar(30);default:'';comment:引用格式" json:"ext"`
 	Author    string    `gorm:"column:author;type:varchar(100);default:'';comment:作者" json:"author"`
 	PublishAt time.Time `gorm:"column:publish_at;type:datetime;not null;comment:出版日期" json:"publish_at"`
-	Keyword   string    `gorm:"column:keyword;type:varchar(100);default:'';comment:关键词" json:"keyword"`
+	Keyword   string    `gorm:"column:keyword;type:varchar(100);default:'';comment:关键词" json:"-"`
 	Tag       string    `gorm:"column:tags;type:varchar(255);default:'';comment:标签" json:"-"`
 	Remark    string    `gorm:"column:remark;type:varchar(255);default:'';comment:备注" json:"remark"`
 	ModelDeleted
@@ -25,6 +25,16 @@ func (m *TechnologyPaper) TableName() string {
 	return m.NewTableName("technology_paper")
 }
 
+func (m *TechnologyPaper) GetKeywordAttribute() []string {
+	out := make([]string, 0)
+	_ = utils.FromJSON(m.Keyword, &out)
+	return out
+}
+
+func (m *TechnologyPaper) SetKeywordAttribute(value []string) {
+	m.Keyword = utils.AnyToJSON(value)
+}
+
 func (m *TechnologyPaper) GetTagAttribute() []string {
 	tags := make([]string, 0)
 	_ = utils.FromJSON(m.Tag, &tags)