feat:优化项目信息

This commit is contained in:
henry
2022-02-15 17:19:23 +08:00
parent cbc0ad1a41
commit dcb5948e91
45 changed files with 852 additions and 100 deletions

View File

@ -21,16 +21,19 @@ type AchievementHandle func(session *session.Enterprise) *Achievement
type (
// AchievementInfo 技术成果信息
AchievementInfo struct {
ID string `json:"id"`
Title string `json:"title"`
Image string `json:"image"`
Industrys []string `json:"industrys"`
Customers []string `json:"customers"`
Maturity config2.TechnologyMaturity `json:"maturity"`
CooperationMode config2.TechnologyCooperationMode `json:"cooperation_mode"`
Keywords []string `json:"keywords"`
VisitCount int `json:"visit_count"`
CollectCount int `json:"collect_count"`
ID string `json:"id"`
Title string `json:"title"`
ModeTitle string `json:"mode_title"`
Image string `json:"image"`
Industrys []string `json:"industrys"`
Customers []string `json:"customers"`
Maturity config2.TechnologyMaturity `json:"maturity"`
MaturityTitle string `json:"maturity_title"`
CooperationMode config2.TechnologyCooperationMode `json:"cooperation_mode"`
CooperationModeTitle string `json:"cooperation_mode_title"`
Keywords []string `json:"keywords"`
VisitCount int `json:"visit_count"`
CollectCount int `json:"collect_count"`
}
// AchievementDetailInfo 技术成果详细信息
AchievementDetailInfo struct {
@ -63,16 +66,19 @@ func (c *Achievement) Instance(title, industry string, page, pageSize int) (*con
for _, v := range out {
list = append(list, &AchievementInfo{
ID: v.GetEncodeID(),
Title: v.Title,
Image: v.Image.Analysis(config.SystemConfig[config.SysImageDomain]),
Industrys: v.GetIndustryAttribute(),
Customers: v.GetCustomerAttribute(),
Maturity: v.Maturity,
CooperationMode: v.CooperationMode,
Keywords: v.GetKeywordAttribute(),
VisitCount: v.VisitCount,
CollectCount: v.CollectCount,
ID: v.GetEncodeID(),
Title: v.Title,
ModeTitle: v.GetModeTitle(),
Image: v.Image.Analysis(config.SystemConfig[config.SysImageDomain]),
Industrys: v.GetIndustryAttribute(),
Customers: v.GetCustomerAttribute(),
Maturity: v.Maturity,
MaturityTitle: config2.GetTechnologyMaturityTitle(v.Maturity),
CooperationMode: v.CooperationMode,
CooperationModeTitle: config2.GetTechnologyCooperationModeTitle(v.CooperationMode),
Keywords: v.GetKeywordAttribute(),
VisitCount: v.VisitCount,
CollectCount: v.CollectCount,
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
@ -86,7 +92,7 @@ func (c *Achievement) Detail(id uint64) (*AchievementDetailInfo, error) {
if err != nil {
return nil, err
} else if out.ID <= 0 {
} else if out == nil || out.ID <= 0 {
return nil, errors.New("操作错误,成果信息不存在或已被删除")
}
//var uid uint64 = 0
@ -105,16 +111,19 @@ func (c *Achievement) Detail(id uint64) (*AchievementDetailInfo, error) {
return &AchievementDetailInfo{
AchievementInfo: AchievementInfo{
ID: out.GetEncodeID(),
Title: out.Title,
Image: out.Image.Analysis(config.SystemConfig[config.SysImageDomain]),
Industrys: out.GetIndustryAttribute(),
Customers: out.GetCustomerAttribute(),
Maturity: out.Maturity,
CooperationMode: out.CooperationMode,
Keywords: out.GetKeywordAttribute(),
VisitCount: out.VisitCount,
CollectCount: out.CollectCount,
ID: out.GetEncodeID(),
Title: out.Title,
ModeTitle: out.GetModeTitle(),
Image: out.Image.Analysis(config.SystemConfig[config.SysImageDomain]),
Industrys: out.GetIndustryAttribute(),
Customers: out.GetCustomerAttribute(),
Maturity: out.Maturity,
MaturityTitle: config2.GetTechnologyMaturityTitle(out.Maturity),
CooperationMode: out.CooperationMode,
CooperationModeTitle: config2.GetTechnologyCooperationModeTitle(out.CooperationMode),
Keywords: out.GetKeywordAttribute(),
VisitCount: out.VisitCount,
CollectCount: out.CollectCount,
},
Introduce: out.Introduce,
}, nil