正在显示
5 个修改的文件
包含
6 行增加
和
10 行删除
@@ -180,7 +180,7 @@ func (srv CooperationApplicationsService) CooperationApplicationsOneclickApprova | @@ -180,7 +180,7 @@ 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, | 183 | + CooperationApplicationVerifyDescription: auditCommand.CooperationApplicationVerifyDescription, |
184 | Action: auditCommand.CooperationApplicationStatus, | 184 | Action: auditCommand.CooperationApplicationStatus, |
185 | Code: "a1-2", | 185 | Code: "a1-2", |
186 | }) | 186 | }) |
@@ -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,7 +223,7 @@ type ( | @@ -223,7 +223,7 @@ type ( | ||
223 | //共创申请一键审核 | 223 | //共创申请一键审核 |
224 | type ( | 224 | type ( |
225 | ReqCooperationApplicationOneclickApproval struct { | 225 | ReqCooperationApplicationOneclickApproval struct { |
226 | - CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //审核描述 | 226 | + CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述 |
227 | Action int `json:"action"` //审核动作,1同意,2拒绝 | 227 | Action int `json:"action"` //审核动作,1同意,2拒绝 |
228 | Code string `cname:"菜单编码" json:"code" valid:"Required"` | 228 | Code string `cname:"菜单编码" json:"code" valid:"Required"` |
229 | } | 229 | } |
@@ -158,7 +158,7 @@ type ( | @@ -158,7 +158,7 @@ type ( | ||
158 | Status int `json:"status"` | 158 | Status int `json:"status"` |
159 | // 组织机构ID | 159 | // 组织机构ID |
160 | OrgId int64 `cname:"组织机构ID" json:"orgId"` | 160 | OrgId int64 `cname:"组织机构ID" json:"orgId"` |
161 | - OrgIds []string `json:"orgIds"` | 161 | + OrgIds []int64 `json:"orgIds"` |
162 | CompanyId int64 `json:"companyId"` | 162 | CompanyId int64 `json:"companyId"` |
163 | CooperationProjectNumber string `json:"cooperationProjectNumber"` | 163 | CooperationProjectNumber string `json:"cooperationProjectNumber"` |
164 | //OffsetLimitFlag bool `json:"offsetLimitFlag"` | 164 | //OffsetLimitFlag bool `json:"offsetLimitFlag"` |
-
请 注册 或 登录 后发表评论