|
@@ -139,7 +139,7 @@ func (srv PersonStatisticsService) CompanyStatistics(cmd *command.CooperationPer |
|
@@ -139,7 +139,7 @@ func (srv PersonStatisticsService) CompanyStatistics(cmd *command.CooperationPer |
139
|
// 分红支出
|
139
|
// 分红支出
|
140
|
DividendsIncome float64 `json:"dividendsIncome"`
|
140
|
DividendsIncome float64 `json:"dividendsIncome"`
|
141
|
// 企业信息
|
141
|
// 企业信息
|
142
|
- Company domain.CompanyData `json:"company"`
|
142
|
+ Company domain.Company `json:"company"`
|
143
|
}
|
143
|
}
|
144
|
var cooperationCompanyStatisticsResponses []cooperationCompanyStatisticsResponse
|
144
|
var cooperationCompanyStatisticsResponses []cooperationCompanyStatisticsResponse
|
145
|
if err := json.UnmarshalFromString(json.MarshalToString(result), &cooperationCompanyStatisticsResponses); err != nil {
|
145
|
if err := json.UnmarshalFromString(json.MarshalToString(result), &cooperationCompanyStatisticsResponses); err != nil {
|
|
@@ -152,10 +152,10 @@ func (srv PersonStatisticsService) CompanyStatistics(cmd *command.CooperationPer |
|
@@ -152,10 +152,10 @@ func (srv PersonStatisticsService) CompanyStatistics(cmd *command.CooperationPer |
152
|
var values = make([]interface{}, 0)
|
152
|
var values = make([]interface{}, 0)
|
153
|
for i := range users.Users {
|
153
|
for i := range users.Users {
|
154
|
user := users.Users[i]
|
154
|
user := users.Users[i]
|
155
|
- cooperationCompanyStatisticsResponses[i].Company = domain.CompanyData{
|
155
|
+ cooperationCompanyStatisticsResponses[i].Company = domain.Company{
|
156
|
CompanyID: user.Org.OrgId,
|
156
|
CompanyID: user.Org.OrgId,
|
157
|
CompanyName: user.Org.OrgName,
|
157
|
CompanyName: user.Org.OrgName,
|
158
|
- CompanyLogo: user.Company.Logo,
|
158
|
+ Logo: user.Company.Logo,
|
159
|
}
|
159
|
}
|
160
|
values = append(values, cooperationCompanyStatisticsResponses[i])
|
160
|
values = append(values, cooperationCompanyStatisticsResponses[i])
|
161
|
}
|
161
|
}
|