allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 Administrator
提交 036abc6bbb17301d6e1f181c3a703c0bd16a210b 2 个父辈 82e42136 1cd39888

合并分支 'feature_order_number' 到 'master' 

Feature order number



查看合并请求 !7
内嵌 并排对比
正在显示 3 个修改的文件 包含 9 行增加 和 5 行删除
@@ -109,13 +109,14 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery @@ -109,13 +109,14 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery
109 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 109 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
110 projectQuery.Operator) 110 projectQuery.Operator)
111 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{ 111 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
112 - PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的  
113 - PageSize: projectQuery.PageSize,  
114 - OrgId: projectQuery.OrgId,  
115 - Status: 1, //搜索状态为“招标中”项目 112 + PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
  113 + PageSize: projectQuery.PageSize,
  114 + OrgId: projectQuery.OrgId,
  115 + //Status: 1, //搜索状态为“招标中”项目
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())
@@ -175,7 +175,8 @@ func (srv PersonStatisticsService) CooperationProjectRecommend(projectQuery *com @@ -175,7 +175,8 @@ func (srv PersonStatisticsService) CooperationProjectRecommend(projectQuery *com
175 PageNumber: projectQuery.PageNumber + 1, 175 PageNumber: projectQuery.PageNumber + 1,
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"`