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-06 18:01:32 +08:00
parent c8578940bf
commit a25464289f
25 changed files with 404 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/api/website/controller/technology/patent.go
View File

@ -6,7 +6,6 @@ import (
model2 "SciencesServer/app/common/model"
"SciencesServer/app/service"
"errors"
"fmt"
)
type Patent struct{}
@ -17,12 +16,12 @@ type (
// PatentInfo 专利信息
PatentInfo struct {
ID string `json:"id"`
*model.SysPatentInfo
*model.TechnologyPatentInfo
}
// PatentDetailInfo 专利详细信息
PatentDetailInfo struct {
ID string `json:"id"`
*model2.SysPatent
*model2.TechnologyPatent
}
)
@ -44,14 +43,12 @@ func (c *Patent) Instance(title, industry string, page, pageSize int) (*controll
var count int64
fmt.Println(out)
if err != nil {
return nil, err
} else if out == nil {
return &controller.ReturnPages{Data: list, Count: count}, nil
}
mSysPatent := model.NewSysPatent()
mTechnologyPatent := model.NewTechnologyPatent()
ids := make([]uint64, 0)
@ -59,15 +56,15 @@ func (c *Patent) Instance(title, industry string, page, pageSize int) (*controll
val := v.(*service.ESPatent)
ids = append(ids, val.ID)
}
ret := make([]*model.SysPatentInfo, 0)
ret := make([]*model.TechnologyPatentInfo, 0)
if ret, err = mSysPatent.Patents(page, pageSize, &count, model2.NewWhereIn("p.id", ids)); err != nil {
if ret, err = mTechnologyPatent.Patents(page, pageSize, &count, model2.NewWhereIn("p.id", ids)); err != nil {
return nil, err
}
for _, v := range ret {
list = append(list, &PatentInfo{
ID: v.GetEncodeID(),
SysPatentInfo: v,
ID: v.GetEncodeID(),
TechnologyPatentInfo: v,
})
}
return &controller.ReturnPages{Data: list, Count: count1}, nil
@ -75,17 +72,17 @@ func (c *Patent) Instance(title, industry string, page, pageSize int) (*controll
// Detail 详细信息
func (c *Patent) Detail(id uint64) (*PatentDetailInfo, error) {
mSysPatent := model.NewSysPatent()
mSysPatent.ID = id
mTechnologyPatent := model.NewTechnologyPatent()
mTechnologyPatent.ID = id
isExist, err := model2.First(mSysPatent.SysPatent)
isExist, err := model2.First(mTechnologyPatent.TechnologyPatent)
if err != nil {
return nil, err
} else if !isExist {
return nil, errors.New("操作错误，专利信息不存在或已被删除")
}
return &PatentDetailInfo{ID: mSysPatent.GetEncodeID(), SysPatent: mSysPatent.SysPatent}, nil
return &PatentDetailInfo{ID: mTechnologyPatent.GetEncodeID(), TechnologyPatent: mTechnologyPatent.TechnologyPatent}, nil
}
func NewPatent() PatentHandle {