feat:完善信息,增加socket

This commit is contained in:
henry
2022-01-27 14:50:52 +08:00
parent 0368be6f11
commit 4ae37b9b4d
30 changed files with 325 additions and 92 deletions

View File

@ -27,8 +27,9 @@ type (
}
// CompanyDetail 公司企业详细信息
CompanyDetail struct {
ID string `json:"id"`
TenantID string `json:"tenant_id"`
ID string `json:"id"`
TenantID string `json:"tenant_id"`
InvitedCode string `json:"invited_code"`
*model2.ManageCompany
Industrys []*config.Industry `json:"industrys"`
Keywords []string `json:"keywords"`
@ -60,7 +61,7 @@ func (c *Company) Instance(tenantID uint64, name string, status int, page, pageS
}
var count int64
out, err := mManageCompany.Companys(page, pageSize, &count)
out, err := mManageCompany.Companys(page, pageSize, &count, where...)
if err != nil {
return nil, err
@ -117,6 +118,7 @@ func (c *Company) Form(params *BasicParams, other *config.IdentityForCompany) er
}
}
mManageCompany.TenantID = c.TenantID
mManageCompany.Kind = model2.ManageCompanyKind(other.Kind)
mManageCompany.Image = model2.Image{Image: params.Image}
mManageCompany.Area = model2.Area{
Province: params.Area.Province, City: params.Area.City, District: params.Area.District, Address: params.Area.Address,
@ -172,10 +174,12 @@ func (c *Company) Detail(id uint64) (*CompanyDetail, error) {
return &CompanyDetail{
ID: out.GetEncodeID(),
TenantID: out.GetEncodeTenantID(),
InvitedCode: (&model2.Model{ID: out.InviterID}).GetEncodeID(),
ManageCompany: out.ManageCompany,
Industrys: _industrys,
Keywords: out.GetKeywordAttribute(),
Area: out.FormatBasic(),
Directions: out.GetDirectionAttribute(),
//Area: out.FormatBasic(),
}, nil
}