作者 yangfu

Merge branch 'feature_order_number' into test

@@ -116,6 +116,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery @@ -116,6 +116,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery
116 Keyword: projectQuery.Keyword, 116 Keyword: projectQuery.Keyword,
117 SearchCooperationProjectExtQueriesFlag: 1, 117 SearchCooperationProjectExtQueriesFlag: 1,
118 SearchCooperationProjectExtQueries: extQueries, 118 SearchCooperationProjectExtQueries: extQueries,
  119 + SortByStatus: 1,
119 }) 120 })
120 if err != nil { 121 if err != nil {
121 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 122 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -176,6 +176,7 @@ func (srv PersonStatisticsService) CooperationProjectRecommend(projectQuery *com @@ -176,6 +176,7 @@ func (srv PersonStatisticsService) CooperationProjectRecommend(projectQuery *com
176 PageSize: projectQuery.PageSize, 176 PageSize: projectQuery.PageSize,
177 CooperationProjectUndertakerType: 3, 177 CooperationProjectUndertakerType: 3,
178 // Status: 1, 178 // Status: 1,
  179 + SortByStatus: 1,
179 }) 180 })
180 if err != nil { 181 if err != nil {
181 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 182 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -212,6 +212,8 @@ type ( @@ -212,6 +212,8 @@ type (
212 SearchCooperationProjectExtQueriesFlag int `cname:"额外的查询条件标识" json:"searchCooperationProjectExtQueriesFlag"` 212 SearchCooperationProjectExtQueriesFlag int `cname:"额外的查询条件标识" json:"searchCooperationProjectExtQueriesFlag"`
213 // 额外的查询条件 213 // 额外的查询条件
214 SearchCooperationProjectExtQueries []*SearchCooperationProjectExtQuery `cname:"额外的查询条件" json:"searchCooperationProjectExtQueries"` 214 SearchCooperationProjectExtQueries []*SearchCooperationProjectExtQuery `cname:"额外的查询条件" json:"searchCooperationProjectExtQueries"`
  215 + // 按共创项目状态排序
  216 + SortByStatus int32 `cname:"按共创项目状态排序" json:"sortByStatus,omitempty"`
215 } 217 }
216 DataCooperationProjectSearchItem struct { 218 DataCooperationProjectSearchItem struct {
217 CooperationProjectID string `json:"cooperationProjectId"` 219 CooperationProjectID string `json:"cooperationProjectId"`