From c8578940bf106addd089c5eca2590b293f5022c8 Mon Sep 17 00:00:00 2001 From: henry Date: Sun, 6 Feb 2022 18:01:19 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=BE=85=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/website/model/manage_expert.go | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/app/api/website/model/manage_expert.go b/app/api/website/model/manage_expert.go index a13126c..c88ebd0 100644 --- a/app/api/website/model/manage_expert.go +++ b/app/api/website/model/manage_expert.go @@ -21,18 +21,16 @@ type ManageExpertInfo struct { // Expert 专家信息 func (m *ManageExpert) Expert(limit int, where ...*model.ModelWhere) ([]*ManageExpertInfo, error) { // 专利信息 - mSysPatent := model.NewSysPatent() - // 用户专利信息 - mUserPatent := model.NewUserPatent() + mTechnologyPatent := model.NewTechnologyPatent() db := orm.GetDB().Table(m.TableName()+" AS e"). Select("e.id", "e.name", "e.industry", "e.image", "e.school", "e.major", "e.keyword", "p.title AS patent_title", "r.name AS research_name"). Joins(fmt.Sprintf("LEFT JOIN %s AS e_u ON e.id = e_u.expert_id AND e_u.invalid_status = %d AND e_u.is_deleted = %d", model.NewUserExpert().TableName(), model.InvalidStatusForNot, model.DeleteStatusForNot)). - Joins(fmt.Sprintf(`LEFT JOIN (SELECT u.uid, SUBSTRING_INDEX(GROUP_CONCAT(p.kind, '$$', p.title ORDER BY p.id DESC SEPARATOR '&&'), '&&', %d) AS title -FROM %s AS u LEFT JOIN %s AS p ON u.patent_id = p.id WHERE u.is_deleted = %d AND p.shelf_status = %d GROUP BY u.uid) AS p ON e_u.uid = p.uid`, - limit, mUserPatent.TableName(), mSysPatent.TableName(), model.DeleteStatusForNot, model.ShelfStatusForUp)). + Joins(fmt.Sprintf(`LEFT JOIN (SELECT uid, SUBSTRING_INDEX(GROUP_CONCAT(kind, '$$', title ORDER BY id DESC SEPARATOR '&&'), '&&', %d) AS title +FROM %s WHERE is_deleted = %d AND shelf_status = %d GROUP BY uid) AS p ON e_u.uid = p.uid`, + limit, mTechnologyPatent.TableName(), model.DeleteStatusForNot, model.ShelfStatusForUp)). Joins(fmt.Sprintf("LEFT JOIN %s AS r ON e.research_id = r.id", model.NewManageResearch().TableName())). Where("e.examine_status = ?", model.ExamineStatusForAgree). Where("e.is_deleted = ?", model.DeleteStatusForNot) @@ -53,18 +51,16 @@ FROM %s AS u LEFT JOIN %s AS p ON u.patent_id = p.id WHERE u.is_deleted = %d AND // Detail 专家信息 func (m *ManageExpert) Detail(limit int, id uint64) (*ManageExpertInfo, error) { // 专利信息 - mSysPatent := model.NewSysPatent() - // 用户专利信息 - mUserPatent := model.NewUserPatent() + mTechnologyPatent := model.NewTechnologyPatent() db := orm.GetDB().Table(m.TableName()+" AS e"). Select("e.id", "e.name", "e.industry", "e.image", "e.school", "e.major", "e.keyword", "e.research", "e.introduce", "p.title AS patent_title", "r.name AS research_name"). Joins(fmt.Sprintf("LEFT JOIN %s AS e_u ON e.id = e_u.expert_id AND e_u.invalid_status = %d AND e_u.is_deleted = %d", model.NewUserExpert().TableName(), model.InvalidStatusForNot, model.DeleteStatusForNot)). - Joins(fmt.Sprintf(`LEFT JOIN (SELECT u.uid, SUBSTRING_INDEX(GROUP_CONCAT(p.kind, '$$', p.title ORDER BY p.id DESC SEPARATOR '&&'), '&&', %d) AS title -FROM %s AS u LEFT JOIN %s AS p ON u.patent_id = p.id WHERE u.is_deleted = %d AND p.shelf_status = %d GROUP BY u.uid) AS p ON e_u.uid = p.uid`, - limit, mUserPatent.TableName(), mSysPatent.TableName(), model.DeleteStatusForNot, model.ShelfStatusForUp)). + Joins(fmt.Sprintf(`LEFT JOIN (SELECT uid, SUBSTRING_INDEX(GROUP_CONCAT(kind, '$$', title ORDER BY id DESC SEPARATOR '&&'), '&&', %d) AS title +FROM %s WHERE is_deleted = %d AND shelf_status = %d GROUP BY uid) AS p ON e_u.uid = p.uid`, + limit, mTechnologyPatent.TableName(), model.DeleteStatusForNot, model.ShelfStatusForUp)). Joins(fmt.Sprintf("LEFT JOIN %s AS r ON e.research_id = r.id", model.NewManageResearch().TableName())). Where("e.id = ?", id)