feat:完善项目信息

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

View File

@ -5,26 +5,26 @@ import (
"SciencesServer/serve/orm"
)
type UserCooperateEnterprise struct {
*model.UserCooperateEnterprise
type ManageCooperateEnterprise struct {
*model.ManageCooperateEnterprise
}
// UserCooperateEnterpriseInfo 用户企业关联信息
type UserCooperateEnterpriseInfo struct {
*model.UserCooperateEnterprise
// ManageCooperateEnterpriseInfo 用户企业关联信息
type ManageCooperateEnterpriseInfo struct {
*model.ManageCooperateEnterprise
PaperTitle string `json:"paper_title"`
PatentTitle string `json:"patent_title"`
}
// Enterprise 企业信息
func (m *UserCooperateEnterprise) Enterprise(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*UserCooperateEnterpriseInfo, error) {
func (m *ManageCooperateEnterprise) Enterprise(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ManageCooperateEnterpriseInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS u").
Select("u.*",
"(SELECT GROUP_CONCAT(t_p.title) FROM (SELECT id, title FROM technology_paper) AS t_p WHERE FIND_IN_SET(t_p.id, u.paper)) AS paper_title",
"(SELECT GROUP_CONCAT(s_p.title) FROM (SELECT id, title FROM sys_patent) AS s_p WHERE FIND_IN_SET(s_p.id, u.patent)) AS patent_title").
Where("u.is_deleted = ?", model.DeleteStatusForNot)
out := make([]*UserCooperateEnterpriseInfo, 0)
out := make([]*ManageCooperateEnterpriseInfo, 0)
if len(where) > 0 {
for _, v := range where {
@ -40,6 +40,6 @@ func (m *UserCooperateEnterprise) Enterprise(page, pageSize int, count *int64, w
return out, nil
}
func NewUserCooperateEnterprise() *UserCooperateEnterprise {
return &UserCooperateEnterprise{model.NewUserCooperateEnterprise()}
func NewManageCooperateEnterprise() *ManageCooperateEnterprise {
return &ManageCooperateEnterprise{model.NewManageCooperateEnterprise()}
}