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-04 15:37:00 +08:00
parent 40841a4a27
commit d2b182952c
8 changed files with 343 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
package manage
import (
"SciencesServer/app/api/website/controller/technology"
"SciencesServer/app/api/website/model"
"SciencesServer/app/api/enterprise/controller/technology"
"SciencesServer/app/api/enterprise/model"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"errors"
@ -13,7 +13,7 @@ import (
type (
// AchievementInfo 成果信息
AchievementInfo struct {
*model.TechnologyAchievementInfo
*model.TechnologyAchievementsInfo
ChargeInfo *model2.TechnologyAchievementChargeInfo `json:"charge_info"`
}
// ProjectInfo 项目信息
@ -24,7 +24,7 @@ type (
// PatentInfo 专利信息
PatentInfo struct {
ID string `json:"id"`
*model.PatentInfo
*model.PatentInstance
}
// PaperInfo 论文信息
PaperInfo struct {
@ -41,9 +41,9 @@ type (
}
// CooperateDetailInfo 合作的企业详细信息
CooperateDetailInfo struct {
Title string `json:"title"`
Patent []*technology.PatentInfo `json:"patent"`
Paper []*technology.PaperInfo `json:"paper"`
Title string `json:"title"`
Patent []*technology.PatentInstance `json:"patent"`
Paper []*technology.PaperInstance `json:"paper"`
}
EquipmentInfo struct {
ID string `json:"id"`
@ -57,7 +57,7 @@ func achievement(uids []uint64, page, pageSize int) (*controller.ReturnPages, er
var count int64
out, err := mTechnologyAchievement.Achievement(page, pageSize, &count, model2.NewWhereIn("uid", uids))
out, err := mTechnologyAchievement.Achievements(page, pageSize, &count, model2.NewWhereIn("uid", uids))
if err != nil {
return nil, err
@ -66,8 +66,8 @@ func achievement(uids []uint64, page, pageSize int) (*controller.ReturnPages, er
for _, v := range out {
list = append(list, &AchievementInfo{
TechnologyAchievementInfo: v,
ChargeInfo: v.GetChargeInfoAttribute(),
TechnologyAchievementsInfo: v,
ChargeInfo: v.GetChargeInfoAttribute(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
@ -105,7 +105,7 @@ func patent(uids []uint64, page, pageSize int) (*controller.ReturnPages, error)
mUserPatent := model.NewUserPatent()
var count int64
out, err := mUserPatent.Patent(page, pageSize, &count, model2.NewWhereIn("u_p.uid", uids))
out, err := mUserPatent.Instance(page, pageSize, &count, model2.NewWhereIn("u_p.uid", uids))
if err != nil {
return nil, err
@ -114,8 +114,7 @@ func patent(uids []uint64, page, pageSize int) (*controller.ReturnPages, error)
for _, v := range out {
list = append(list, &PatentInfo{
ID: v.GetEncodeID(),
PatentInfo: v,
ID: v.GetEncodeID(), PatentInstance: v,
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
@ -190,8 +189,8 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
}
out := &CooperateDetailInfo{
Title: mUserCooperateEnterprise.Title,
Patent: make([]*technology.PatentInfo, 0),
Paper: make([]*technology.PaperInfo, 0),
Patent: make([]*technology.PatentInstance, 0),
Paper: make([]*technology.PaperInstance, 0),
}
// 专利信息
mSysPatent := model.NewSysPatent()
@ -202,7 +201,7 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
return nil, err
}
for _, v := range patents {
out.Patent = append(out.Patent, &technology.PatentInfo{
out.Patent = append(out.Patent, &technology.PatentInstance{
ID: v.GetEncodeID(),
SysPatentInfo: v,
})
@ -220,7 +219,7 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
return nil, err
}
for _, v := range papers {
out.Paper = append(out.Paper, &technology.PaperInfo{
out.Paper = append(out.Paper, &technology.PaperInstance{
ID: v.GetEncodeID(), Title: v.Title, Ext: v.Ext, Keywords: v.GetKeywordAttribute(),
})
}