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 16:03:47 +08:00
parent 417d7961ec
commit 6adf1381d0
9 changed files with 271 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/api/admin/model/manage_company.go
View File

@ -12,33 +12,35 @@ type ManageCompany struct {
}
type (
// ManageCompanyBasic 公司企业基本信息
ManageCompanyBasic struct {
*model.ManageCompany
model.Area
}
// ManageCompanyInfo 公司企业信息
ManageCompanyInfo struct {
model.Model
Kind model.ManageCompanyKind `json:"kind"`
Name string `json:"name"`
Code string `json:"code"`
Industry string `json:"industry"`
Industry string `json:"-"`
Address string `json:"address"`
*model.Examine
CreatedAt time.Time `json:"created_at"`
model.Area
TenantProvince string `json:"-"`
TenantCity string `json:"-"`
}
// ManageCompanyDetail 公司企业信息
ManageCompanyDetail struct {
*model.ManageCompany
model.Area
}
)
// Company 公司企业信息
func (m *ManageCompany) Company(id uint64) (*ManageCompanyBasic, error) {
func (m *ManageCompany) Company(id uint64) (*ManageCompanyDetail, error) {
db := orm.GetDB().Table(m.TableName()+" AS c").
Select("c.*", "t.province", "t.city").
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON c.tenant_id = t.id", model.NewSysTenant().TableName())).
Where("c.id = ?", id)
out := new(ManageCompanyBasic)
out := new(ManageCompanyDetail)
err := db.Scan(out).Error
@ -47,8 +49,9 @@ func (m *ManageCompany) Company(id uint64) (*ManageCompanyBasic, error) {
func (m *ManageCompany) Companys(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ManageCompanyInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS c").
Select("c.id", "c.kind", "c.name", "c.code", "c.industry", "c.address", "c.examine_status", "c.created_at",
"t.province", "t.city").
Select("c.id", "c.kind", "c.name", "c.code", "c.industry", "c.address", "c.examine_status",
"c.created_at", "c.province", "c.city",
"t.province AS tenant_province", "t.city AS tenant_city").
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON c.tenant_id = t.id", model.NewSysTenant().TableName())).
Where("c.is_deleted = ?", model.DeleteStatusForNot)

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

@ -11,11 +11,6 @@ type ManageExpert struct {
}
type (
// ManageExpertBasic 专家基本信息
ManageExpertBasic struct {
*model.ManageExpert
model.Area
}
// ManageExpertInfo 专家信息
ManageExpertInfo struct {
*model.ManageExpert
@ -23,17 +18,24 @@ type (
ResearchName string `json:"research_name"`
LaboratoryName string `json:"laboratory_name"`
model.Area
TenantProvince string `json:"-"`
TenantCity string `json:"-"`
}
// ManageExpertDetail 专家信息
ManageExpertDetail struct {
*model.ManageExpert
model.Area
}
)
// Expert 专家信息
func (m *ManageExpert) Expert(id uint64) (*ManageExpertBasic, error) {
func (m *ManageExpert) Expert(id uint64) (*ManageExpertDetail, 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)
out := new(ManageExpertDetail)
err := db.Scan(out).Error
@ -44,7 +46,8 @@ func (m *ManageExpert) Expert(id uint64) (*ManageExpertBasic, error) {
func (m *ManageExpert) Experts(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ManageExpertInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS e").
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").
"e.province", "e.city", "e.address", "e.created_at",
"t.province AS tenant_province", "t.city AS tenant_city").
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())).

64
app/api/admin/model/manage_research.go
View File

@ -1,11 +1,73 @@
package model
import "SciencesServer/app/common/model"
import (
"SciencesServer/app/common/model"
"SciencesServer/serve/orm"
"fmt"
)
type ManageResearch struct {
*model.ManageResearch
}
type (
// ManageResearchInfo 基本信息
ManageResearchInfo struct {
model.Model
Name string `json:"name"`
Code string `json:"code"`
Industry string `json:"industry"`
Research string `json:"research"`
ExamineStatus string `json:"examine_status"`
model.Area
TenantProvince string `json:"-"`
TenantCity string `json:"-"`
}
// ManageResearchDetail 详细信息
ManageResearchDetail struct {
*model.ManageResearch
model.Area
}
)
// Research 科研机构信息
func (m *ManageResearch) Research(id uint64) (*ManageResearchDetail, error) {
db := orm.GetDB().Table(m.TableName()+" AS r").
Select("r.*", "t.province", "t.city").
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON r.tenant_id = t.id", model.NewSysTenant().TableName())).
Where("r.id = ?", id)
out := new(ManageResearchDetail)
err := db.Scan(out).Error
return out, err
}
// Researchs 科研机构信息
func (m *ManageResearch) Researchs(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ManageResearchInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS r").
Select("r.id", "r.name", "r.code", "r.industry", "r.research", "r.province", "r.city", "r.district",
"r.examine_status", "t.province AS tenant_province", "t.city AS tenant_city").
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON r.tenant_id = t.id", model.NewSysTenant().TableName())).
Where("r.is_deleted = ?", model.DeleteStatusForNot)
out := make([]*ManageResearchInfo, 0)
if len(where) > 0 {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
}
}
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Order("r.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
func NewManageResearch() *ManageResearch {
return &ManageResearch{model.NewManageResearch()}
}