feat：优化项目信息

app/api/admin/model/manage_expert.go

@@ -28,8 +28,54 @@ type (
 		TenantProvince string `json:"-"`
 		TenantCity     string `json:"-"`
 	}
+	// ManageExpertUser 专家用户信息
+	ManageExpertUser struct {
+		model.Model
+		Name         string `json:"name"`
+		ResearchName string `json:"research_name"`
+	}
+	// ManageExpertPatent 专家专利信息
+	ManageExpertPatent struct {
+		model.Model
+		Title           string `json:"title"`
+		ApplyName       string `json:"apply_name"`
+		ApplyCode       string `json:"apply_code"`
+		ApplyAt         string `json:"apply_at"`
+		Inventor        string `json:"inventor"`
+		UserPatentCount int64  `json:"-"`
+	}
 )
 
+// User 用户专家信息
+func (m *ManageExpert) User(uid uint64) (*ManageExpertUser, error) {
+	db := orm.GetDB().Table(m.TableName()+" AS e").
+		Select("e.id", "e.name", "r.name AS research_name").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS r ON e.research_id = r.id", model.NewManageResearch().TableName())).
+		Where("e.uid = ?", uid).
+		Where("e.examine_status = ?", model.ExamineStatusForAgree).
+		Where("e.is_deleted = ?", model.DeleteStatusForNot)
+
+	out := new(ManageExpertUser)
+
+	err := db.Scan(out).Error
+
+	return out, err
+}
+
+// User 用户专家信息
+func (m *ManageExpert) Basic(id uint64) (*ManageExpertUser, error) {
+	db := orm.GetDB().Table(m.TableName()+" AS e").
+		Select("e.id", "e.name", "r.name AS research_name").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS r ON e.research_id = r.id", model.NewManageResearch().TableName())).
+		Where("e.id = ?", id)
+
+	out := new(ManageExpertUser)
+
+	err := db.Scan(out).Error
+
+	return out, err
+}
+
 // Expert 专家信息
 func (m *ManageExpert) Expert(id uint64) (*ManageExpertDetail, error) {
 	db := orm.GetDB().Table(m.TableName()+" AS e").
@@ -59,7 +105,7 @@ func (m *ManageExpert) Experts(page, pageSize int, count *int64, where ...*model
 			"WHERE u.is_deleted = %d AND u.invalid_status = %d GROUP BY u.expert_id) AS u ON e.id = u.expert_id",
 			model.NewUserExpert().TableName(),
 			model.NewTechnologyAchievement().TableName(), model.DeleteStatusForNot, model.TechnologyStatusKindForAgree,
-			model.NewTechnologyPatent().TableName(), model.DeleteStatusForNot,
+			model.NewUserPatent().TableName(), model.DeleteStatusForNot,
 			model.DeleteStatusForNot, model.InvalidStatusForNot)).
 		Where("e.is_deleted = ?", model.DeleteStatusForNot)
 
@@ -80,6 +126,27 @@ func (m *ManageExpert) Experts(page, pageSize int, count *int64, where ...*model
 	return out, nil
 }
 
+// Patents 专利信息
+func (m *ManageExpert) Patents(where ...*model.ModelWhere) ([]*ManageExpertPatent, error) {
+	db := orm.GetDB().Table(model.NewTechnologyPatent().TableName()+" AS p").
+		Select("p.id", "p.title", "p.apply_name", "p.apply_code", "p.apply_at", "p.inventor", "u.count AS user_patent_count").
+		Joins(fmt.Sprintf("LEFT JOIN (SELECT patent_id, COUNT(patent_id) AS count FROM %s WHERE is_deleted = %d GROUP BY patent_id) AS u ON p.id = u.patent_id",
+			model.NewUserPatent().TableName(), model.DeleteStatusForNot)).
+		Where("p.is_deleted = ?", model.DeleteStatusForNot)
+
+	if len(where) > 0 {
+		for _, v := range where {
+			db = db.Where(v.Condition, v.Value)
+		}
+	}
+	out := make([]*ManageExpertPatent, 0)
+
+	if err := db.Order("p.id " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func NewManageExpert() *ManageExpert {
 	return &ManageExpert{model.NewManageExpert()}
 }