feat：完善项目信息

app/api/website/model/manage_expert.go

@@ -3,12 +3,76 @@ package model
 import (
 	"SciencesServer/app/common/model"
 	"SciencesServer/serve/orm"
+	"fmt"
 )
 
 type ManageExpert struct {
 	*model.ManageExpert
 }
 
+type ManageExpertInfo struct {
+	*model.ManageExpert
+	PatentTitle string `json:"-"`
+	Research    string `json:"-"`
+	Introduce   string `json:"introduce"`
+}
+
+// Expert 专家信息
+func (m *ManageExpert) Expert(limit int, where ...*model.ModelWhere) ([]*ManageExpertInfo, error) {
+	// 专利信息
+	mSysPatent := model.NewSysPatent()
+	// 用户专利信息
+	mUserPatent := model.NewUserPatent()
+
+	db := orm.GetDB().Table(m.TableName()+" AS e").
+		Select("e.id", "e.name", "e.industry", "e.school", "e.major", "e.keyword",
+			"p.title AS patent_title").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS e_u ON e.id = p.patent_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.title ORDER BY p.id DESC SEPARATOR '&&'), '&&', %d) AS title
+FROM %s AS u LEFT JOIN %s AS p ON u.parent_id = p.id WHERE u.is_deleted = %d AND p.shelf_status = %d) AS p ON e_u.uid = p.uid`,
+			limit, mUserPatent.TableName(), mSysPatent.TableName(), model.DeleteStatusForNot, model.ShelfStatusForUp)).
+		Where("e.examine_status = ?", model.ExamineStatusForAgree).
+		Where("e.is_deleted = ?", model.DeleteStatusForNot)
+
+	if len(where) > 0 {
+		for _, v := range where {
+			db = db.Where(v.Condition, v.Value)
+		}
+	}
+	out := make([]*ManageExpertInfo, 0)
+
+	if err := db.Order("e.id " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Detail 专家信息
+func (m *ManageExpert) Detail(limit int, id uint64) (*ManageExpertInfo, error) {
+	// 专利信息
+	mSysPatent := model.NewSysPatent()
+	// 用户专利信息
+	mUserPatent := model.NewUserPatent()
+
+	db := orm.GetDB().Table(m.TableName()+" AS e").
+		Select("e.id", "e.name", "e.industry", "e.school", "e.major", "e.keyword", "e.research", "e.introduce",
+			"p.title AS patent_title").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS e_u ON e.id = p.patent_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.title ORDER BY p.id DESC SEPARATOR '&&'), '&&', %d) AS title
+FROM %s AS u LEFT JOIN %s AS p ON u.parent_id = p.id WHERE u.is_deleted = %d AND p.shelf_status = %d) AS p ON e_u.uid = p.uid`,
+			limit, mUserPatent.TableName(), mSysPatent.TableName(), model.DeleteStatusForNot, model.ShelfStatusForUp)).
+		Where("e.id = ?", id)
+
+	out := new(ManageExpertInfo)
+
+	if err := db.Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Distribution 分布信息
 func (m *ManageExpert) Distribution() ([]*DataAreaDistributionInfo, error) {
 	out := make([]*DataAreaDistributionInfo, 0)

app/api/website/model/technology_achievement.go

@@ -20,11 +20,11 @@ type TechnologyAchievementInfo struct {
 // Achievement 成果信息
 func (m *TechnologyAchievement) Achievement(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*TechnologyAchievementInfo, error) {
 	db := orm.GetDB().Table(m.TableName()+" AS a").
-		Select("a.id", "a.title", "a.mode", "a.image", "a.industry", "a.customer", "a.maturity",
+		Select("a.id", "a.title", "a.mode", "a.image", "a.charge_info", "a.industry", "a.customer", "a.maturity",
 			"a.cooperation_mode", "a.keyword", "v.count AS visit_count", "c.count AS collect_count").
 		Joins(fmt.Sprintf("LEFT JOIN (SELECT achievement_id, SUM(count) AS count FROM %s WHERE is_deleted = %d GROUP BY achievement_id) AS v ON a.id = v.achievement_id",
 			model.NewTechnologyAchievementVisit().TableName(), model.DeleteStatusForNot)).
-		Joins(fmt.Sprintf("LEFT JOIN (SELECT achievement_id, SUM(count) AS count FROM %s WHERE is_deleted = %d GROUP BY achievement_id) AS c ON a.id = c.achievement_id",
+		Joins(fmt.Sprintf("LEFT JOIN (SELECT achievement_id, COUNT(id) AS count FROM %s WHERE is_deleted = %d GROUP BY achievement_id) AS c ON a.id = c.achievement_id",
 			model.NewTechnologyAchievementCollect().TableName(), model.DeleteStatusForNot)).
 		Where("a.status = ?", model.TechnologyAchievementStatusForAgree).
 		Where("a.is_deleted = ?", model.DeleteStatusForNot)

app/api/website/model/user_expert.go

@@ -0,0 +1,11 @@
+package model
+
+import "SciencesServer/app/common/model"
+
+type UserExpert struct {
+	*model.UserExpert
+}
+
+func NewUserExpert() *UserExpert {
+	return &UserExpert{model.NewUserExpert()}
+}