feat：优化项目信息

app/api/enterprise/model/manage_enterprise.go

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

app/api/enterprise/model/user_bank.go

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

app/api/enterprise/model/user_identity.go

@@ -0,0 +1,59 @@
+package model
+
+import (
+	"SciencesServer/app/basic/config"
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+	"strings"
+)
+
+type UserIdentity struct {
+	*model.UserIdentity
+}
+
+type (
+	// UserIdentityForExpert 专家信息
+	UserIdentityForExpert struct {
+		ID       uint64 `json:"id"`
+		Name     string `json:"name"`
+		Mobile   string `json:"mobile"`
+		Identity string `json:"-"`
+	}
+)
+
+// Expert 专家数据
+func (m *UserIdentity) Expert(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*UserIdentityForExpert, error) {
+	db := orm.GetDB().Table(m.TableName()+" AS i").
+		Select(strings.Join([]string{"i.id", "i.name", "u.mobile"}, ",")).
+		Joins(fmt.Sprintf("LEFT JOIN %s AS u ON m.uid = u.uuid", model.NewUserInstance().TableName())).
+		Where("m.is_deleted = ?", model.DeleteStatusForNot).
+		Where("m.identity = ?", config.TenantUserIdentityForExpert)
+
+	out := make([]*UserIdentityForExpert, 0)
+
+	if len(where) > 0 {
+		for _, v := range where {
+			db = db.Where(v.Condition, v.Value)
+		}
+	}
+	if err := db.Count(count).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Order("i.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// LastChooseInfo 最后一次选中的信息
+func (m *UserIdentity) LastChooseInfo(uid uint64) error {
+	_, err := model.FirstField(m.UserIdentity, []string{"id", "uuid", "identity"},
+		model.NewWhere("uid", uid),
+		model.NewWhere("is_selected", model.UserIdentitySelectedForYes))
+	return err
+}
+
+func NewUserIdentity() *UserIdentity {
+	return &UserIdentity{model.NewUserIdentity()}
+}

app/api/enterprise/model/user_manage.go

@@ -1,59 +0,0 @@
-package model
-
-import (
-	"SciencesServer/app/basic/config"
-	"SciencesServer/app/common/model"
-	"SciencesServer/serve/orm"
-	"fmt"
-	"strings"
-)
-
-type UserManage struct {
-	*model.UserManage
-}
-
-type (
-	// UserManageForExpert 专家信息
-	UserManageForExpert struct {
-		ID           uint64 `json:"id"`
-		Name         string `json:"name"`
-		Mobile       string `json:"mobile"`
-		IdentityInfo string `json:"-"`
-	}
-)
-
-// Expert 专家数据
-func (m *UserManage) Expert(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*UserManageForExpert, error) {
-	db := orm.GetDB().Table(m.TableName()+" AS m").
-		Select(strings.Join([]string{"m.id", "m.name", "u.mobile", "m.identity_info"}, ",")).
-		Joins(fmt.Sprintf("LEFT JOIN %s AS u ON m.uid = u.uuid", model.NewUserInstance().TableName())).
-		Where("m.is_deleted = ?", model.DeleteStatusForNot).
-		Where("m.identity = ?", config.TenantUserIdentityForExpert)
-
-	out := make([]*UserManageForExpert, 0)
-
-	if len(where) > 0 {
-		for _, v := range where {
-			db = db.Where(v.Condition, v.Value)
-		}
-	}
-	if err := db.Count(count).Error; err != nil {
-		return nil, err
-	}
-	if err := db.Order("m.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// LastChooseInfo 最后一次选中的信息
-func (m *UserManage) LastChooseInfo(uid uint64) error {
-	_, err := model.FirstField(m.UserManage, []string{"id", "tenant_id", "uuid", "identity"},
-		model.NewWhere("uid", uid),
-		model.NewWhere("selected", model.UserManageSelectedForYes))
-	return err
-}
-
-func NewUserManage() *UserManage {
-	return &UserManage{UserManage: model.NewUserManage()}
-}

app/api/enterprise/model/user_manage_bank.go

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