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-01-05 11:29:27 +08:00
parent d8ca61a449
commit 822ced6041
88 changed files with 375 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
package manage
import (
"SciencesServer/app/api/enterprise/controller/technology"
"SciencesServer/app/api/enterprise/model"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
@ -26,6 +25,18 @@ type (
ID string `json:"id"`
*model.PatentInstance
}
// PatentInstance 专利信息
PatentInstance struct {
ID string `json:"id"`
*model.SysPatentInfo
}
// PaperInstance 论文信息
PaperInstance struct {
ID string `json:"id"`
Title string `json:"title"`
Ext string `json:"ext"`
Keywords []string `json:"keywords"`
}
// PaperInfo 论文信息
PaperInfo struct {
ID string `json:"id"`
@ -41,9 +52,9 @@ type (
}
// CooperateDetailInfo 合作的企业详细信息
CooperateDetailInfo struct {
Title string `json:"title"`
Patent []*technology.PatentInstance `json:"patent"`
Paper []*technology.PaperInstance `json:"paper"`
Title string `json:"title"`
Patent []*PatentInstance `json:"patent"`
Paper []*PaperInstance `json:"paper"`
}
EquipmentInfo struct {
ID string `json:"id"`
@ -189,8 +200,8 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
}
out := &CooperateDetailInfo{
Title: mUserCooperateEnterprise.Title,
Patent: make([]*technology.PatentInstance, 0),
Paper: make([]*technology.PaperInstance, 0),
Patent: make([]*PatentInstance, 0),
Paper: make([]*PaperInstance, 0),
}
// 专利信息
mSysPatent := model.NewSysPatent()
@ -201,7 +212,7 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
return nil, err
}
for _, v := range patents {
out.Patent = append(out.Patent, &technology.PatentInstance{
out.Patent = append(out.Patent, &PatentInstance{
ID: v.GetEncodeID(),
SysPatentInfo: v,
})
@ -219,7 +230,7 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
return nil, err
}
for _, v := range papers {
out.Paper = append(out.Paper, &technology.PaperInstance{
out.Paper = append(out.Paper, &PaperInstance{
ID: v.GetEncodeID(), Title: v.Title, Ext: v.Ext, Keywords: v.GetKeywordAttribute(),
})
}