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-02-09 22:26:09 +08:00
parent 957a4436a8
commit 1b5026edce
7 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/api/enterprise/controller/manage/common.go
View File

@ -23,7 +23,7 @@ type (
// PatentInfo 专利信息
PatentInfo struct {
ID string `json:"id"`
*model.TechnologyPatentBasicInfo
*model.TechnologyPatentExpertInfo
}
// PatentInstance 专利信息
PatentInstance struct {
@ -112,26 +112,20 @@ func project(uids []uint64, page, pageSize int) (*controller.ReturnPages, error)
}
// patent 专利信息
func patent(uids []uint64, page, pageSize int) (*controller.ReturnPages, error) {
mTechnologyPatent := model.NewTechnologyPatent()
func patent(expertID uint64, page, pageSize int) (*controller.ReturnPages, error) {
mTechnologyPatentExpert := model.NewTechnologyPatentExpert()
var count int64
out := make([]*model.TechnologyPatentBasicInfo, 0)
if err := model2.PagesFields(mTechnologyPatent.TechnologyPatent, &out, []string{
"id", "title", "apply_at", "description",
}, page, pageSize, &count, &model2.ModelWhereOrder{
Where: model2.NewWhere("uid", uids),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}, &model2.ModelWhereOrder{
Where: model2.NewWhere("shelf_status", model2.ShelfStatusForUp),
}); err != nil {
out, err := mTechnologyPatentExpert.Patent(page, pageSize, &count, model2.NewWhere("u.expert_id", expertID))
if err != nil {
return nil, err
}
list := make([]*PatentInfo, 0)
for _, v := range out {
list = append(list, &PatentInfo{
ID: v.GetEncodeID(), TechnologyPatentBasicInfo: v,
ID: v.GetEncodeID(), TechnologyPatentExpertInfo: v,
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil

13
app/api/enterprise/controller/manage/expert.go
View File

@ -254,13 +254,12 @@ func (c *Expert) Project(id uint64, page, pageSize int) (*controller.ReturnPages
// Patent 专利信息
func (c *Expert) Patent(id uint64, page, pageSize int) (*controller.ReturnPages, error) {
// 查询专家身份下用户信息
uids, err := c.user(id)
if err != nil {
return nil, err
}
return patent(uids, page, pageSize)
//uids, err := c.user(id)
//
//if err != nil {
// return nil, err
//}
return patent(id, page, pageSize)
}
// Paper 论文信息