feat：优化项目信息

app/api/admin/controller/manage/expert.go

@@ -237,53 +237,48 @@ func (c *Expert) Patent(id uint64, title, applyName string) ([]*ExpertPatent, er
 }
 
 // PatentBind 专利认领绑定
-func (c *Expert) PatentBind(id uint64, patentID []uint64) error {
-	mUserExpert := model.NewUserExpert()
+func (c *Expert) PatentBind(id uint64, patentIDs []uint64) error {
+	mManageExpert := model.NewManageExpert()
+	mManageExpert.ID = id
 
-	uids := make([]uint64, 0)
-
-	err := model2.Pluck(mUserExpert.UserExpert, "uid", &uids, model2.NewWhere("expert_id", id),
-		model2.NewWhere("invalid_status", model2.InvalidStatusForNot))
+	isExist, err := model2.FirstField(mManageExpert.ManageExpert, []string{"id", "tenant_id"})
 
 	if err != nil {
 		return err
+	} else if !isExist {
+		return errors.New("操作错误，专家信息不存在或已被删除")
+	} else if c.TenantID > 0 && c.TenantID != mManageExpert.TenantID {
+		return errors.New("操作错误，无权限操作")
 	}
-	if len(uids) <= 0 {
-		return nil
-	}
-	data := make([]*model2.UserPatent, 0)
+	data := make([]*model2.TechnologyPatentExpert, 0)
 
-	for _, uid := range uids {
-		for _, v := range patentID {
-			data = append(data, &model2.UserPatent{
-				UID:      uid,
-				PatentID: v,
-			})
-		}
+	for _, v := range patentIDs {
+		data = append(data, &model2.TechnologyPatentExpert{
+			ExpertID: mManageExpert.ID, PatentID: v,
+		})
 	}
 	if len(data) > 0 {
-		return model2.Creates(model.NewUserPatent().UserPatent, data)
+		return model2.Creates(model.NewTechnologyPatentExpert().TechnologyPatentExpert, data)
 	}
 	return nil
 }
 
 // PatentUnbind 专利认领解绑
 func (c *Expert) PatentUnbind(id uint64, patentID []uint64) error {
-	mUserExpert := model.NewUserExpert()
+	mManageExpert := model.NewManageExpert()
+	mManageExpert.ID = id
 
-	uids := make([]uint64, 0)
-
-	err := model2.Pluck(mUserExpert.UserExpert, "uid", &uids, model2.NewWhere("expert_id", id),
-		model2.NewWhere("invalid_status", model2.InvalidStatusForNot))
+	isExist, err := model2.FirstField(mManageExpert.ManageExpert, []string{"id", "tenant_id"})
 
 	if err != nil {
 		return err
+	} else if !isExist {
+		return errors.New("操作错误，专家信息不存在或已被删除")
+	} else if c.TenantID > 0 && c.TenantID != mManageExpert.TenantID {
+		return errors.New("操作错误，无权限操作")
 	}
-	if len(uids) <= 0 {
-		return nil
-	}
-	return model2.DeleteWhere(model.NewUserPatent().UserPatent, []*model2.ModelWhere{
-		model2.NewWhereIn("uid", uids),
+	return model2.DeleteWhere(model.NewTechnologyPatentExpert().TechnologyPatentExpert, []*model2.ModelWhere{
+		model2.NewWhere("expert_id", mManageExpert.ID),
 		model2.NewWhereIn("patent_id", patentID),
 	})
 }

app/api/admin/controller/technology/patent.go

@@ -299,9 +299,9 @@ func (c *Patent) Delete(id uint64) error {
 		if err = model2.Delete(mTechnologyPatent.TechnologyPatent, tx); err != nil {
 			return err
 		}
-		mUserPatent := model.NewUserPatent()
+		mTechnologyPatentExpert := model.NewTechnologyPatentExpert()
 
-		if err = model2.DeleteWhere(mUserPatent.UserPatent, []*model2.ModelWhere{
+		if err = model2.DeleteWhere(mTechnologyPatentExpert.TechnologyPatentExpert, []*model2.ModelWhere{
 			model2.NewWhere("patent_id", id),
 			model2.NewWhere("is_deleted", model2.DeleteStatusForNot),
 		}, tx); err != nil {

app/api/admin/model/manage_expert.go

@@ -99,14 +99,6 @@ func (m *ManageExpert) Experts(page, pageSize int, count *int64, where ...*model
 		Joins(fmt.Sprintf("LEFT JOIN %s AS r ON e.research_id = r.id", model.NewManageResearch().TableName())).
 		Joins(fmt.Sprintf("LEFT JOIN %s AS l ON e.laboratory_id = l.id", model.NewManageLaboratory().TableName())).
 		Joins(fmt.Sprintf("LEFT JOIN %s AS t ON e.tenant_id = t.id", model.NewSysTenant().TableName())).
-		Joins(fmt.Sprintf("LEFT JOIN (SELECT u.expert_id, SUM(t_a.count) AS achievement_count, SUM(p.count) AS patent_count FROM %s AS u "+
-			"LEFT JOIN (SELECT uid, COUNT(id) AS count FROM %s WHERE is_deleted = %d AND status = %d GROUP BY uid) AS t_a ON u.uid = t_a.uid "+
-			"LEFT JOIN (SELECT uid, COUNT(id) AS count FROM %s WHERE is_deleted = %d GROUP BY uid) AS p ON u.uid = p.uid "+
-			"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.NewUserPatent().TableName(), model.DeleteStatusForNot,
-			model.DeleteStatusForNot, model.InvalidStatusForNot)).
 		Where("e.is_deleted = ?", model.DeleteStatusForNot)
 
 	if len(where) > 0 {
@@ -131,7 +123,7 @@ func (m *ManageExpert) Patents(where ...*model.ModelWhere) ([]*ManageExpertPaten
 	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)).
+			model.NewTechnologyPatentExpert().TableName(), model.DeleteStatusForNot)).
 		Where("p.is_deleted = ?", model.DeleteStatusForNot)
 
 	if len(where) > 0 {

app/api/admin/model/technology_patent_expert.go

@@ -0,0 +1,12 @@
+package model
+
+import "SciencesServer/app/common/model"
+
+// TechnologyPatentExpert 专利专家信息
+type TechnologyPatentExpert struct {
+	*model.TechnologyPatentExpert
+}
+
+func NewTechnologyPatentExpert() *TechnologyPatentExpert {
+	return &TechnologyPatentExpert{model.NewTechnologyPatentExpert()}
+}

app/api/admin/model/user_patent.go

@@ -1,12 +0,0 @@
-package model
-
-import "SciencesServer/app/common/model"
-
-// UserPatent 用户专利信息
-type UserPatent struct {
-	*model.UserPatent
-}
-
-func NewUserPatent() *UserPatent {
-	return &UserPatent{model.NewUserPatent()}
-}