feat:优化项目信息

This commit is contained in:
henry
2022-02-10 11:36:47 +08:00
parent 1b5026edce
commit 412aaaf1af
6 changed files with 17 additions and 9 deletions

View File

@ -72,8 +72,9 @@ func (m *TechnologyPatent) Distribution() ([]*DataAreaDistributionInfo, error) {
Select("e.province", "e.city", "e.district", "GROUP_CONCAT(p_c.industry_detail SEPARATOR '&') AS industry").
Joins(fmt.Sprintf("RIGHT JOIN %s AS p_c ON p.ipc_code = p_c.ipc AND p_c.is_deleted = %d",
model.NewTechnologyPatentClassify().TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS u_e ON p.uid = u_e.uid", model.NewUserExpert().TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS e ON u_e.expert_id = e.id", model.NewManageExpert().TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS p_e ON p.id = p_e.patent_id AND p_e.is_deleted = %d",
model.NewTechnologyPatentExpert().TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS e ON p_e.expert_id = e.id", model.NewManageExpert().TableName())).
Where("p.is_deleted = ?", model.DeleteStatusForNot).
Group("e.province").Group("e.city").Group("e.district").
Order("e.province " + model.OrderModeToAsc).Order("e.city " + model.OrderModeToAsc).Order("e.district " + model.OrderModeToAsc).