作者 yangfu

Merge branch 'feature_order_number' into test

@@ -109,10 +109,10 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery @@ -109,10 +109,10 @@ 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,
@@ -175,7 +175,7 @@ func (srv PersonStatisticsService) CooperationProjectRecommend(projectQuery *com @@ -175,7 +175,7 @@ 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 }) 179 })
180 if err != nil { 180 if err != nil {
181 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 181 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())