feat:完善项目信息
This commit is contained in:
@ -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(),
|
||||
})
|
||||
}
|
||||
|
@ -2,7 +2,7 @@ package technology
|
||||
|
||||
import (
|
||||
"SciencesServer/app/api/enterprise/model"
|
||||
"SciencesServer/app/api/manage/controller"
|
||||
"SciencesServer/app/basic/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/session"
|
||||
"SciencesServer/utils"
|
||||
|
@ -2,8 +2,8 @@ package technology
|
||||
|
||||
import (
|
||||
"SciencesServer/app/api/enterprise/model"
|
||||
"SciencesServer/app/api/manage/controller"
|
||||
"SciencesServer/app/basic/config"
|
||||
"SciencesServer/app/basic/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/session"
|
||||
"errors"
|
||||
|
@ -2,7 +2,7 @@ package technology
|
||||
|
||||
import (
|
||||
"SciencesServer/app/api/enterprise/model"
|
||||
"SciencesServer/app/api/manage/controller"
|
||||
"SciencesServer/app/basic/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/session"
|
||||
"SciencesServer/utils"
|
||||
@ -24,12 +24,6 @@ type (
|
||||
*model2.TechnologyPaper
|
||||
Tags []string `json:"tags"`
|
||||
}
|
||||
PaperInstance struct {
|
||||
ID string `json:"id"`
|
||||
Title string `json:"title"`
|
||||
Ext string `json:"ext"`
|
||||
Keywords []string `json:"keywords"`
|
||||
}
|
||||
PaperParams struct {
|
||||
ID uint64
|
||||
Title, Ext, Author, PublishAt, Remark string
|
||||
|
@ -3,7 +3,7 @@ package technology
|
||||
import (
|
||||
"SciencesServer/app/api/enterprise/controller/sys"
|
||||
"SciencesServer/app/api/enterprise/model"
|
||||
"SciencesServer/app/api/manage/controller"
|
||||
"SciencesServer/app/basic/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/service"
|
||||
"SciencesServer/app/session"
|
||||
@ -37,11 +37,6 @@ type (
|
||||
Description string `json:"description"`
|
||||
ApplyAt string `json:"apply_at"`
|
||||
}
|
||||
// PatentInstance 专利信息
|
||||
PatentInstance struct {
|
||||
ID string `json:"id"`
|
||||
*model.SysPatentInfo
|
||||
}
|
||||
// PatentDetailInfo 专利详细信息
|
||||
PatentDetailInfo struct {
|
||||
ID string `json:"id"`
|
||||
|
@ -2,7 +2,7 @@ package technology
|
||||
|
||||
import (
|
||||
"SciencesServer/app/api/enterprise/model"
|
||||
"SciencesServer/app/api/manage/controller"
|
||||
"SciencesServer/app/basic/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/session"
|
||||
"SciencesServer/utils"
|
||||
|
@ -2,7 +2,7 @@ package technology
|
||||
|
||||
import (
|
||||
"SciencesServer/app/api/enterprise/model"
|
||||
"SciencesServer/app/api/manage/controller"
|
||||
"SciencesServer/app/basic/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/session"
|
||||
"SciencesServer/utils"
|
||||
|
Reference in New Issue
Block a user