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

转到一个项目

作者 yangfu
提交 6575f84968c8d6ced7e778fef5ed2231522de186 2 个父辈 2f031e0f e8ce7409

Merge branch 'feature_sign_up' into test 

# Conflicts:
#	pkg/application/mobile/cooperation/service/cooperation_projects.go
#	pkg/application/mobile/cooperation/service/statistics_person.go
#	pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_project.go
内嵌 并排对比
正在显示 3 个修改的文件 包含 18 行增加 和 11 行删除
@@ -109,14 +109,15 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery @@ -109,14 +109,15 @@ 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 SortByStatus: 1,
  120 + IsSkipFetchProjectModel: true,
120 }) 121 })
121 if err != nil { 122 if err != nil {
122 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 123 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -39,10 +39,11 @@ func (srv PersonStatisticsService) IndexStatistics(cmd *command.IndexStatisticsC @@ -39,10 +39,11 @@ func (srv PersonStatisticsService) IndexStatistics(cmd *command.IndexStatisticsC
39 gatewayUser := allied_creation_user.NewHttplibAlliedCreationUser( 39 gatewayUser := allied_creation_user.NewHttplibAlliedCreationUser(
40 cmd.Operator) 40 cmd.Operator)
41 users, err := gatewayUser.UserSearch(allied_creation_user.ReqUserSearch{ 41 users, err := gatewayUser.UserSearch(allied_creation_user.ReqUserSearch{
42 - Limit: 1,  
43 - Offset: 0,  
44 - UserType: domain.UserTypeCooperation | domain.UserTypeEmployee,  
45 - UserBaseId: cmd.Operator.UserBaseId, 42 + Limit: 1,
  43 + Offset: 0,
  44 + UserType: domain.UserTypeCooperation | domain.UserTypeEmployee,
  45 + UserBaseId: cmd.Operator.UserBaseId,
  46 + EnableStatus: domain.UserStatusEnable,
46 }) 47 })
47 if err != nil { 48 if err != nil {
48 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 49 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
@@ -103,9 +104,10 @@ func (srv PersonStatisticsService) CompanyStatistics(cmd *command.CooperationPer @@ -103,9 +104,10 @@ func (srv PersonStatisticsService) CompanyStatistics(cmd *command.CooperationPer
103 gatewayUser := allied_creation_user.NewHttplibAlliedCreationUser( 104 gatewayUser := allied_creation_user.NewHttplibAlliedCreationUser(
104 cmd.Operator) 105 cmd.Operator)
105 users, err := gatewayUser.UserSearch(allied_creation_user.ReqUserSearch{ 106 users, err := gatewayUser.UserSearch(allied_creation_user.ReqUserSearch{
106 - Limit: 100,  
107 - Offset: 0,  
108 - UserBaseId: cmd.Operator.UserBaseId, 107 + Limit: 100,
  108 + Offset: 0,
  109 + UserBaseId: cmd.Operator.UserBaseId,
  110 + EnableStatus: domain.UserStatusEnable,
109 //UserType: domain.UserTypeCooperation, 111 //UserType: domain.UserTypeCooperation,
110 }) 112 })
111 if err != nil { 113 if err != nil {
@@ -181,6 +183,8 @@ func (srv PersonStatisticsService) CooperationProjectRecommend(projectQuery *com @@ -181,6 +183,8 @@ func (srv PersonStatisticsService) CooperationProjectRecommend(projectQuery *com
181 PageNumber: projectQuery.PageNumber + 1, 183 PageNumber: projectQuery.PageNumber + 1,
182 PageSize: projectQuery.PageSize, 184 PageSize: projectQuery.PageSize,
183 CooperationProjectUndertakerType: 3, 185 CooperationProjectUndertakerType: 3,
  186 + Status: 1,
  187 + IsSkipFetchProjectModel: true,
184 // Status: 1, 188 // Status: 1,
185 SortByStatus: 1, 189 SortByStatus: 1,
186 }) 190 })
@@ -214,6 +214,8 @@ type ( @@ -214,6 +214,8 @@ type (
214 SearchCooperationProjectExtQueries []*SearchCooperationProjectExtQuery `cname:"额外的查询条件" json:"searchCooperationProjectExtQueries"` 214 SearchCooperationProjectExtQueries []*SearchCooperationProjectExtQuery `cname:"额外的查询条件" json:"searchCooperationProjectExtQueries"`
215 // 按共创项目状态排序 215 // 按共创项目状态排序
216 SortByStatus int32 `cname:"按共创项目状态排序" json:"sortByStatus,omitempty"` 216 SortByStatus int32 `cname:"按共创项目状态排序" json:"sortByStatus,omitempty"`
  217 + // 是否跳过获取共创模式
  218 + IsSkipFetchProjectModel bool `cname:"是否跳过获取共创模式" json:"isSkipFetchProjectModel,omitempty"`
217 } 219 }
218 DataCooperationProjectSearchItem struct { 220 DataCooperationProjectSearchItem struct {
219 CooperationProjectID string `json:"cooperationProjectId"` 221 CooperationProjectID string `json:"cooperationProjectId"`