williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：优化项目信息

Browse Source
This commit is contained in:
henry
2022-03-05 15:31:22 +08:00
parent dcb5948e91
commit 4dc8deaadb
27 changed files with 401 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/enterprise/controller/technology/paper.go
View File

@ -22,7 +22,8 @@ type (
PaperInfo struct {
ID string `json:"id"`
*model2.TechnologyPaper
Tags []string `json:"tags"`
Keywords []string `json:"keywords"`
Tags []string `json:"tags"`
}
PaperParams struct {
ID uint64
@ -53,7 +54,8 @@ func (c *Paper) List(title string, page, pageSize int) (*controller.ReturnPages,
list := make([]*PaperInfo, 0)
for _, v := range out {
list = append(list, &PaperInfo{ID: v.GetEncodeID(), TechnologyPaper: v, Tags: v.GetTagAttribute()})
list = append(list, &PaperInfo{ID: v.GetEncodeID(), TechnologyPaper: v, Keywords: v.GetKeywordAttribute(),
Tags: v.GetTagAttribute()})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}

20
app/api/enterprise/controller/technology/patent.go
View File

@ -65,6 +65,15 @@ func (c *PatentParams) add(tenantID, uid uint64) error {
return errors.New("操作错误，申请号或公开（公告）号已存在")
}
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
// 查询当前的专家信息
mUserExpert := model.NewUserExpert()
if isExist, err = model2.LastWhere(mUserExpert.UserExpert, []string{"id", "expert_id"}, model2.NewWhere("uid", uid),
model2.NewWhere("invalid_status", model2.InvalidStatusForNot)); err != nil {
return err
} else if !isExist {
return errors.New("操作错误，无专家信息")
}
mTechnologyPatent.Kind = model2.TechnologyPatentKind(c.Kind)
mTechnologyPatent.Title = c.Title
mTechnologyPatent.FileUrl = c.FileUrl
@ -83,15 +92,6 @@ func (c *PatentParams) add(tenantID, uid uint64) error {
if err = model2.Create(mTechnologyPatent.TechnologyPatent, tx); err != nil {
return err
}
// 查询当前的专家信息
mUserExpert := model.NewUserExpert()
if isExist, err = model2.LastWhere(mUserExpert.UserExpert, []string{"id", "expert_id"}, model2.NewWhere("uid", uid),
model2.NewWhere("invalid_status", model2.InvalidStatusForNot)); err != nil {
return err
} else if !isExist {
return errors.New("操作错误，无专家信息")
}
mTechnologyPatentExpert := model.NewTechnologyPatentExpert()
mTechnologyPatentExpert.ExpertID = mUserExpert.ExpertID
mTechnologyPatentExpert.PatentID = mTechnologyPatent.ID
@ -215,7 +215,7 @@ func (c *Patent) List(kind int, title, applyCode, openCode, ipcCode string, page
where := []*model2.ModelWhere{model2.NewWhereFindInSet("p.inventor", expert.Name)}
if kind <= 0 {
if kind > 0 {
where = append(where, model2.NewWhere("p.kind", kind))
}
if title != "" {