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-21 16:52:08 +08:00
parent adb5bd7283
commit bdb570d19a
14 changed files with 328 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/api/website/controller/manage/common.go
View File

@ -35,13 +35,13 @@ type (
// CooperateInfo 合作的企业信息
CooperateInfo struct {
ID string `json:"id"`
Title string `json:"title"`
Name string `json:"name"`
PatentCount int `json:"patent_count"`
PaperCount int `json:"paper_count"`
}
// CooperateDetailInfo 合作的企业详细信息
CooperateDetailInfo struct {
Title string `json:"title"`
Name string `json:"name"`
Patent []*technology.PatentInfo `json:"patent"`
Paper []*technology.PaperInfo `json:"paper"`
}
@ -148,18 +148,18 @@ func paper(uids []uint64, page, pageSize int) (*controller.ReturnPages, error) {
// cooperate 合作的信息
func cooperate(uids []uint64, page, pageSize int) (*controller.ReturnPages, error) {
mUserCooperateEnterprise := model.NewUserCooperateEnterprise()
mManageCooperateEnterprise := model.NewManageCooperateEnterprise()
out := make([]*model2.UserCooperateEnterprise, 0)
out := make([]*model2.ManageCooperateEnterprise, 0)
var count int64
if err := model2.PagesFields(mUserCooperateEnterprise.UserCooperateEnterprise, &out, []string{"id", "title", "paper", "patent"},
if err := model2.PagesFields(mManageCooperateEnterprise.ManageCooperateEnterprise, &out, []string{"id", "title", "paper", "patent"},
page, pageSize, &count, &model2.ModelWhereOrder{
Where: model2.NewWhereIn("uid", uids),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}, &model2.ModelWhereOrder{
Where: model2.NewWhere("kind", model2.UserCooperateEnterpriseModeForCooperateAlready)}); err != nil {
Where: model2.NewWhere("kind", model2.ManageCooperateEnterpriseModeForCooperateAlready)}); err != nil {
return nil, err
}
@ -168,7 +168,7 @@ func cooperate(uids []uint64, page, pageSize int) (*controller.ReturnPages, erro
for _, v := range out {
list = append(list, &CooperateInfo{
ID: v.GetEncodeID(),
Title: v.Title,
Name: v.Name,
PatentCount: len(v.GetPatentAttribute()),
PaperCount: len(v.GetPaperAttribute()),
})
@ -178,10 +178,10 @@ func cooperate(uids []uint64, page, pageSize int) (*controller.ReturnPages, erro
// cooperateDetail 合作企业详情
func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
mUserCooperateEnterprise := model.NewUserCooperateEnterprise()
mUserCooperateEnterprise.ID = id
mManageCooperateEnterprise := model.NewManageCooperateEnterprise()
mManageCooperateEnterprise.ID = id
isExist, err := model2.FirstField(mUserCooperateEnterprise.UserCooperateEnterprise, []string{"id", "title", "paper", "patent"})
isExist, err := model2.FirstField(mManageCooperateEnterprise.ManageCooperateEnterprise, []string{"id", "title", "paper", "patent"})
if err != nil {
return nil, err
@ -189,7 +189,7 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
return nil, errors.New("操作错误，企业信息不存在或已被删除")
}
out := &CooperateDetailInfo{
Title: mUserCooperateEnterprise.Title,
Name: mManageCooperateEnterprise.Name,
Patent: make([]*technology.PatentInfo, 0),
Paper: make([]*technology.PaperInfo, 0),
}
@ -198,7 +198,7 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
patents := make([]*model.SysPatentInfo, 0)
if patents, err = mSysPatent.Instance(model2.NewWhereIn("p.id", mUserCooperateEnterprise.GetPatentAttribute())); err != nil {
if patents, err = mSysPatent.Instance(model2.NewWhereIn("p.id", mManageCooperateEnterprise.GetPatentAttribute())); err != nil {
return nil, err
}
for _, v := range patents {
@ -214,7 +214,7 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
if err = model2.ScanFields(mTechnologyPaper.TechnologyPaper, &papers, []string{"id", "title", "ext", "keyword"},
&model2.ModelWhereOrder{
Where: model2.NewWhereIn("id", mUserCooperateEnterprise.GetPaperAttribute()),
Where: model2.NewWhereIn("id", mManageCooperateEnterprise.GetPaperAttribute()),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}); err != nil {
return nil, err