作者 tangxuhui

更新

@@ -13,7 +13,9 @@ type ListCooperationContractQuery struct { @@ -13,7 +13,9 @@ type ListCooperationContractQuery struct {
13 // 查询偏离量 13 // 查询偏离量
14 PageNumber int `json:"pageNumber"` 14 PageNumber int `json:"pageNumber"`
15 // 查询限制 15 // 查询限制
16 - PageSize int `json:"pageSize" valid:"Required"` 16 + PageSize int `json:"pageSize" valid:"Required"`
  17 + CooperationContractNumber string `json:"cooperationContractNumber"`
  18 + SponsorName string `json:"sponsorName"`
17 } 19 }
18 20
19 func (listCooperationContractQuery *ListCooperationContractQuery) Valid(validation *validation.Validation) { 21 func (listCooperationContractQuery *ListCooperationContractQuery) Valid(validation *validation.Validation) {
@@ -112,8 +112,10 @@ func (cooperationContractService *CooperationContractService) ListCooperationCon @@ -112,8 +112,10 @@ func (cooperationContractService *CooperationContractService) ListCooperationCon
112 } 112 }
113 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationContractQuery.Operator) 113 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationContractQuery.Operator)
114 result, err := creationCooperationGateway.CooperationContractSearch(allied_creation_cooperation.ReqCooperationContractSearch{ 114 result, err := creationCooperationGateway.CooperationContractSearch(allied_creation_cooperation.ReqCooperationContractSearch{
115 - PageNumber: listCooperationContractQuery.PageNumber,  
116 - PageSize: listCooperationContractQuery.PageSize, 115 + PageNumber: listCooperationContractQuery.PageNumber,
  116 + PageSize: listCooperationContractQuery.PageSize,
  117 + SponsorName: listCooperationContractQuery.SponsorName,
  118 + CooperationContractNumber: listCooperationContractQuery.CooperationContractNumber,
117 }) 119 })
118 if err != nil { 120 if err != nil {
119 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 121 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -88,10 +88,10 @@ func (controller *BaseController) GetOperator() domain.Operator { @@ -88,10 +88,10 @@ func (controller *BaseController) GetOperator() domain.Operator {
88 } 88 }
89 // TODO:测试数据后期删除 89 // TODO:测试数据后期删除
90 if op.UserId == 0 { 90 if op.UserId == 0 {
91 - op.UserId = 9 91 + op.UserId = 23
92 op.CompanyId = 23 92 op.CompanyId = 23
93 op.OrgId = 45 93 op.OrgId = 45
94 - op.UserBaseId = 5 94 + op.UserBaseId = 23
95 } 95 }
96 // TODO:打印测试日志 96 // TODO:打印测试日志
97 log.Logger.Debug("operator " + json.MarshalToString(op)) 97 log.Logger.Debug("operator " + json.MarshalToString(op))