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

转到一个项目

作者 yangfu
提交 440dd74142762168d58b356fdb41f64f29e41636 1 个父辈 9d5394db

merge feature_sign_up

内嵌 并排对比
正在显示 3 个修改的文件 包含 10 行增加 和 11 行删除
@@ -12,6 +12,6 @@ require ( @@ -12,6 +12,6 @@ require (
12 github.com/google/uuid v1.1.1 12 github.com/google/uuid v1.1.1
13 github.com/linmadan/egglib-go v0.0.0-20210827085852-177fa745932d 13 github.com/linmadan/egglib-go v0.0.0-20210827085852-177fa745932d
14 github.com/stretchr/testify v1.7.0 14 github.com/stretchr/testify v1.7.0
15 - golang.org/x/text v0.3.6  
16 github.com/tal-tech/go-queue v1.0.5 15 github.com/tal-tech/go-queue v1.0.5
  16 + golang.org/x/text v0.3.6
17 ) 17 )
@@ -3,13 +3,11 @@ package service @@ -3,13 +3,11 @@ package service
3 import ( 3 import (
4 "fmt" 4 "fmt"
5 "github.com/linmadan/egglib-go/core/application" 5 "github.com/linmadan/egglib-go/core/application"
6 - "github.com/linmadan/egglib-go/core/application"  
7 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/common/query" 6 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/common/query"
8 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" 7 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
9 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_basic" 8 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_basic"
10 - "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/version_server"  
11 - "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"  
12 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user" 9 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
  10 + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/version_server"
13 ) 11 )
14 12
15 const IOSPage = "http://fir.fjmaimaimai.com/pdvn" 13 const IOSPage = "http://fir.fjmaimaimai.com/pdvn"
@@ -134,10 +134,10 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery @@ -134,10 +134,10 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery
134 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 134 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
135 projectQuery.Operator) 135 projectQuery.Operator)
136 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{ 136 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
137 - PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的  
138 - PageSize: projectQuery.PageSize,  
139 - OrgId: projectQuery.OrgId,  
140 - Status: 1, //搜索状态为“招标中”项目 137 + PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
  138 + PageSize: projectQuery.PageSize,
  139 + OrgId: projectQuery.OrgId,
  140 + //Status: 1, //搜索状态为“招标中”项目
141 Keyword: projectQuery.Keyword, 141 Keyword: projectQuery.Keyword,
142 SearchCooperationProjectExtQueriesFlag: 1, 142 SearchCooperationProjectExtQueriesFlag: 1,
143 SearchCooperationProjectExtQueries: extQueries, 143 SearchCooperationProjectExtQueries: extQueries,
@@ -241,12 +241,13 @@ func (srv CooperationProjectService) PersonSearchCooperationProjectStarred(proje @@ -241,12 +241,13 @@ func (srv CooperationProjectService) PersonSearchCooperationProjectStarred(proje
241 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 241 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
242 projectQuery.Operator) 242 projectQuery.Operator)
243 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{ 243 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
244 - PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的  
245 - PageSize: projectQuery.PageSize,  
246 - Status: 1, //搜索状态为“招标中”项目 244 + PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
  245 + PageSize: projectQuery.PageSize,
  246 + //Status: 1, //搜索状态为“招标中”项目
247 Keyword: projectQuery.Keyword, 247 Keyword: projectQuery.Keyword,
248 OrgIds: userInfo.FavoriteOrg(), 248 OrgIds: userInfo.FavoriteOrg(),
249 IsSkipFetchProjectModel: true, 249 IsSkipFetchProjectModel: true,
  250 + SortByStatus: 1,
250 }) 251 })
251 if err != nil { 252 if err != nil {
252 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 253 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())