作者 tangxuhui

修正问题; 共创项目选项框 搜索数据错误

@@ -180,9 +180,9 @@ func (srv CooperationApplicationsService) CooperationApplicationsOneclickApprova @@ -180,9 +180,9 @@ func (srv CooperationApplicationsService) CooperationApplicationsOneclickApprova
180 auditCommand.Operator) 180 auditCommand.Operator)
181 _, err := creationCooperationGateway.CooperationApplicationsOneclickApproval( 181 _, err := creationCooperationGateway.CooperationApplicationsOneclickApproval(
182 allied_creation_cooperation.ReqCooperationApplicationOneclickApproval{ 182 allied_creation_cooperation.ReqCooperationApplicationOneclickApproval{
183 - CooperationApplicationDescription: auditCommand.CooperationApplicationVerifyDescription,  
184 - Action: auditCommand.CooperationApplicationStatus,  
185 - Code: "a1-2", 183 + CooperationApplicationVerifyDescription: auditCommand.CooperationApplicationVerifyDescription,
  184 + Action: auditCommand.CooperationApplicationStatus,
  185 + Code: "a1-2",
186 }) 186 })
187 if err != nil { 187 if err != nil {
188 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 188 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
@@ -7,5 +7,5 @@ import ( @@ -7,5 +7,5 @@ import (
7 type CooperationProjectSelectorQuery struct { 7 type CooperationProjectSelectorQuery struct {
8 //操作人 8 //操作人
9 Operator domain.Operator `json:"-"` 9 Operator domain.Operator `json:"-"`
10 - MatchCooperationProjectNumber string `json:"matchCooperationProjectNumber"` //匹配项目编号 10 + MatchCooperationProjectNumber string `json:"matchCooperationProjectNumber"` //匹配项目编号 matchCooperationProjectNumber
11 } 11 }
@@ -102,6 +102,7 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje @@ -102,6 +102,7 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje
102 //项目名 102 //项目名
103 CooperationProjectName: listCooperationProjectQuery.CooperationProjectName, 103 CooperationProjectName: listCooperationProjectQuery.CooperationProjectName,
104 CompanyId: listCooperationProjectQuery.Operator.CompanyId, 104 CompanyId: listCooperationProjectQuery.Operator.CompanyId,
  105 + OrgIds: listCooperationProjectQuery.Operator.OrgIds,
105 }) 106 })
106 if err != nil { 107 if err != nil {
107 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 108 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -146,16 +147,11 @@ func (cooperationProjectService *CooperationProjectService) UpdateCooperationPro @@ -146,16 +147,11 @@ func (cooperationProjectService *CooperationProjectService) UpdateCooperationPro
146 func (cooperationProjectService *CooperationProjectService) ListCooperationProjectSelector(listCooperationProjectQuery *query.CooperationProjectSelectorQuery) (int64, interface{}, error) { 147 func (cooperationProjectService *CooperationProjectService) ListCooperationProjectSelector(listCooperationProjectQuery *query.CooperationProjectSelectorQuery) (int64, interface{}, error) {
147 148
148 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationProjectQuery.Operator) 149 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationProjectQuery.Operator)
149 - orgIds := []string{}  
150 - for _, v := range listCooperationProjectQuery.Operator.OrgIds {  
151 - idStr := strconv.Itoa(int(v))  
152 - orgIds = append(orgIds, idStr)  
153 - }  
154 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{ 150 result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
155 PageSize: 999, 151 PageSize: 999,
156 CooperationProjectNumber: listCooperationProjectQuery.MatchCooperationProjectNumber, 152 CooperationProjectNumber: listCooperationProjectQuery.MatchCooperationProjectNumber,
157 CompanyId: listCooperationProjectQuery.Operator.CompanyId, 153 CompanyId: listCooperationProjectQuery.Operator.CompanyId,
158 - OrgIds: orgIds, 154 + OrgIds: listCooperationProjectQuery.Operator.OrgIds,
159 }) 155 })
160 if err != nil { 156 if err != nil {
161 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 157 return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -223,9 +223,9 @@ type ( @@ -223,9 +223,9 @@ type (
223 //共创申请一键审核 223 //共创申请一键审核
224 type ( 224 type (
225 ReqCooperationApplicationOneclickApproval struct { 225 ReqCooperationApplicationOneclickApproval struct {
226 - CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //审核描述  
227 - Action int `json:"action"` //审核动作,1同意,2拒绝  
228 - Code string `cname:"菜单编码" json:"code" valid:"Required"` 226 + CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述
  227 + Action int `json:"action"` //审核动作,1同意,2拒绝
  228 + Code string `cname:"菜单编码" json:"code" valid:"Required"`
229 } 229 }
230 230
231 DataCooperationApplicationOneclickApproval struct { 231 DataCooperationApplicationOneclickApproval struct {
@@ -157,10 +157,10 @@ type ( @@ -157,10 +157,10 @@ type (
157 // 共创项目状态,1招标中,2结束 0 全部 157 // 共创项目状态,1招标中,2结束 0 全部
158 Status int `json:"status"` 158 Status int `json:"status"`
159 // 组织机构ID 159 // 组织机构ID
160 - OrgId int64 `cname:"组织机构ID" json:"orgId"`  
161 - OrgIds []string `json:"orgIds"`  
162 - CompanyId int64 `json:"companyId"`  
163 - CooperationProjectNumber string `json:"cooperationProjectNumber"` 160 + OrgId int64 `cname:"组织机构ID" json:"orgId"`
  161 + OrgIds []int64 `json:"orgIds"`
  162 + CompanyId int64 `json:"companyId"`
  163 + CooperationProjectNumber string `json:"cooperationProjectNumber"`
164 //OffsetLimitFlag bool `json:"offsetLimitFlag"` 164 //OffsetLimitFlag bool `json:"offsetLimitFlag"`
165 // 用户基础数据id 165 // 用户基础数据id
166 UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId"` 166 UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId"`