合并分支 'feature_order_number' 到 'master'

Feature order number



查看合并请求 !7

@@ -112,10 +112,11 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery
 		PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
 		PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
 		PageSize:   projectQuery.PageSize,
 		PageSize:   projectQuery.PageSize,
 		OrgId:      projectQuery.OrgId,
 		OrgId:      projectQuery.OrgId,
-		Status:                                 1, //搜索状态为“招标中”项目
+		//Status:                                 1, //搜索状态为“招标中”项目
 		Keyword:                                projectQuery.Keyword,
 		Keyword:                                projectQuery.Keyword,
 		SearchCooperationProjectExtQueriesFlag: 1,
 		SearchCooperationProjectExtQueriesFlag: 1,
 		SearchCooperationProjectExtQueries:     extQueries,
 		SearchCooperationProjectExtQueries:     extQueries,
+		SortByStatus:                           1,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())

@@ -175,7 +175,8 @@ func (srv PersonStatisticsService) CooperationProjectRecommend(projectQuery *com
 		PageNumber:                       projectQuery.PageNumber + 1,
 		PageNumber:                       projectQuery.PageNumber + 1,
 		PageSize:                         projectQuery.PageSize,
 		PageSize:                         projectQuery.PageSize,
 		CooperationProjectUndertakerType: 3,
 		CooperationProjectUndertakerType: 3,
-		Status:                           1,
+		// Status:                           1,
+		SortByStatus: 1,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())

@@ -212,6 +212,8 @@ type (
 		SearchCooperationProjectExtQueriesFlag int `cname:"额外的查询条件标识" json:"searchCooperationProjectExtQueriesFlag"`
 		SearchCooperationProjectExtQueriesFlag int `cname:"额外的查询条件标识" json:"searchCooperationProjectExtQueriesFlag"`
 		// 额外的查询条件
 		// 额外的查询条件
 		SearchCooperationProjectExtQueries []*SearchCooperationProjectExtQuery `cname:"额外的查询条件" json:"searchCooperationProjectExtQueries"`
 		SearchCooperationProjectExtQueries []*SearchCooperationProjectExtQuery `cname:"额外的查询条件" json:"searchCooperationProjectExtQueries"`
+		// 按共创项目状态排序
+		SortByStatus int32 `cname:"按共创项目状态排序" json:"sortByStatus,omitempty"`
 	}
 	}
 	DataCooperationProjectSearchItem struct {
 	DataCooperationProjectSearchItem struct {
 		CooperationProjectID          string               `json:"cooperationProjectId"`
 		CooperationProjectID          string               `json:"cooperationProjectId"`