williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目信息

Browse Source
This commit is contained in:
henry
2022-01-19 10:59:43 +08:00
parent 26a3205c08
commit 86fa9cd853
9 changed files with 281 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/api/admin/model/manage_expert.go
View File

@ -10,24 +10,45 @@ type ManageExpert struct {
*model.ManageExpert
}
type ManageExpertInfo struct {
*model.ManageExpert
Name string `json:"name"`
ResearchName string `json:"research_name"`
LaboratoryName string `json:"laboratory_name"`
type (
// ManageExpertBasic 专家基本信息
ManageExpertBasic struct {
*model.ManageExpert
model.Area
}
// ManageExpertInfo 专家信息
ManageExpertInfo struct {
*model.ManageExpert
Name string `json:"name"`
ResearchName string `json:"research_name"`
LaboratoryName string `json:"laboratory_name"`
model.Area
}
)
// Expert 专家信息
func (m *ManageExpert) Expert(id uint64) (*ManageExpertBasic, error) {
db := orm.GetDB().Table(m.TableName()+" AS e").
Select("e.*", "t.province", "t.city").
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON e.tenant_id = t.id", model.NewSysTenant().TableName())).
Where("e.id = ?", id)
out := new(ManageExpertBasic)
err := db.Scan(out).Error
return out, err
}
// Experts 专家信息
func (m *ManageExpert) Experts(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ManageExpertInfo, error) {
mUserInstance := model.NewUserInstance()
mSysTenant := model.NewSysTenant()
db := orm.GetDB().Table(m.TableName()+" AS e").
Select("e.*", "u.name", "l.name AS laboratory_name", "r.name AS research_name").
Joins(fmt.Sprintf("LEFT JOIN %s AS u ON e.uid = u.uuid", mUserInstance.TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS l ON e.tenant_id = l.id", mSysTenant.TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS r ON l.parent_id = r.id", mSysTenant.TableName())).
Where("")
Select("e.id", "e.name", "e.industry", "r.name AS research_name", "l.name AS laboratory_name",
"t.province", "t.city", "e.address", "e.created_at").
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())).
Where("e.is_deleted = ?", model.DeleteStatusForNot)
if len(where) > 0 {
for _, v := range where {
@ -39,6 +60,7 @@ func (m *ManageExpert) Experts(page, pageSize int, count *int64, where ...*model
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Order("e.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}