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-09 22:26:09 +08:00
parent 957a4436a8
commit 1b5026edce
7 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/api/enterprise/model/technology_patent_expert.go
View File

@ -14,11 +14,10 @@ type TechnologyPatentExpert struct {
// TechnologyPatentExpertInfo 用户专利信息
type TechnologyPatentExpertInfo struct {
model.Model
Title string `json:"title"`
ApplyCode string `json:"apply_code"`
ApplyName string `json:"apply_name"`
ApplyAt string `json:"apply_at"`
model.Shelf
Title string `json:"title"`
ApplyCode string `json:"apply_code"`
ApplyName string `json:"apply_name"`
ApplyAt string `json:"apply_at"`
Status model.TechnologyPatentStatus `json:"status"`
CreatedAt time.Time
}
@ -26,7 +25,7 @@ type TechnologyPatentExpertInfo struct {
// Patent 专利信息
func (m *TechnologyPatentExpert) Patent(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*TechnologyPatentExpertInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS u").
Select("u.id", "p.title", "p.apply_code", "p.apply_name", "p.apply_at", "p.status", "p.created_at").
Select("p.id", "p.title", "p.apply_code", "p.apply_name", "p.apply_at", "p.status", "p.created_at").
Joins(fmt.Sprintf("LEFT JOIN %s AS p ON u.patent_id = p.id", model.NewTechnologyPatent().TableName())).
Where("u.is_deleted = ?", model.DeleteStatusForNot)
@ -40,7 +39,7 @@ func (m *TechnologyPatentExpert) Patent(page, pageSize int, count *int64, where
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Order("u.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
if err := db.Order("p.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil