正在显示
3 个修改的文件
包含
30 行增加
和
33 行删除
@@ -215,34 +215,15 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon | @@ -215,34 +215,15 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon | ||
215 | } | 215 | } |
216 | 216 | ||
217 | type CooperationContractUndertake struct { | 217 | type CooperationContractUndertake struct { |
218 | - Undertaker struct { | ||
219 | - UsersName string `json:"userName"` | ||
220 | - Phone string `json:"phone"` | ||
221 | - UserId int `json:"userId,string,"` | ||
222 | - UserCode string `json:"userCode"` | ||
223 | - } `json:"undertaker"` | ||
224 | - CooperationContractDescription string `json:"cooperationContractDescription"` | ||
225 | - CooperationContractId int `json:"cooperationContractId,string,"` | ||
226 | - CooperationContractName string `json:"cooperationContractName"` | ||
227 | - CooperationContractNumber string `json:"cooperationContractNumber"` | ||
228 | - CooperationContractSponsor struct { | ||
229 | - UsersName string `json:"userName"` | ||
230 | - Phone string `json:"phone"` | ||
231 | - UserId int `json:"userId,string,"` | ||
232 | - UserCode string `json:"userCode"` | ||
233 | - } `json:"cooperationContractSponsor"` | ||
234 | - CooperationMode struct { | ||
235 | - CooperationModeId int `json:"cooperationModeId,string"` | ||
236 | - CooperationModeName string `json:"cooperationModeName"` | ||
237 | - CooperationModeNumber string `json:"cooperationModeNumber"` | ||
238 | - } `json:"cooperationMode"` | ||
239 | - Org struct { | ||
240 | - OrgName string `json:"orgName"` | ||
241 | - } `json:"org"` | ||
242 | - Attachment []domain.Attachment `json:"attachment"` | 218 | + UndertakerId int64 `json:"undertakerId,string"` // 承接人ID |
219 | + UndertakerCode string `json:"undertakerCode"` // 承接人编号 | ||
220 | + UndertakerName string `json:"undertakerName"` // 承接人姓名 | ||
221 | + UndertakerPhone string `json:"undertakerPhone"` // 承接人电话 | ||
222 | + CooperationContractNumber string `json:"cooperationContractNumber"` // 项目合约编号 | ||
223 | + CooperationContractName string `json:"cooperationContractName"` // 项目合约名称 | ||
224 | + Attachment []domain.Attachment `json:"attachment"` // 合同附件 | ||
225 | + SponsorName string `json:"sponsorName"` // 发起人姓名 | ||
226 | + DepartmentName string `json:"departmentName"` // 发起部门名称 | ||
227 | + CooperationModeName string `json:"cooperationModeName"` // 共创模式名称 | ||
228 | + OrgName string `json:"orgName"` // 组织机构名称 | ||
243 | } | 229 | } |
244 | - | ||
245 | -// func ToCooperationContractUndertake(allied_creation_cooperation.DataCooperationContractSearchByUndertaker) *CooperationContractUndertake { | ||
246 | -// data := CooperationContractUndertake{} | ||
247 | -// return &data | ||
248 | -// } |
@@ -205,7 +205,7 @@ func NewCooperationContractService(options map[string]interface{}) *CooperationC | @@ -205,7 +205,7 @@ func NewCooperationContractService(options map[string]interface{}) *CooperationC | ||
205 | func (cooperationContractService *CooperationContractService) SearchCooperationContractsByUndertake(queryParam *query.SearchCooperationContractsByUndertake) ( | 205 | func (cooperationContractService *CooperationContractService) SearchCooperationContractsByUndertake(queryParam *query.SearchCooperationContractsByUndertake) ( |
206 | int, interface{}, error) { | 206 | int, interface{}, error) { |
207 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(queryParam.Operator) | 207 | creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(queryParam.Operator) |
208 | - _, err := creationCooperationGateway.CooperationContractsSearchByUndertaker( | 208 | + result, err := creationCooperationGateway.CooperationContractsSearchByUndertaker( |
209 | allied_creation_cooperation.ReqCooperationContractSearchByUndertaker{ | 209 | allied_creation_cooperation.ReqCooperationContractSearchByUndertaker{ |
210 | CooperationContractName: queryParam.CooperationContractName, | 210 | CooperationContractName: queryParam.CooperationContractName, |
211 | SponsorName: queryParam.ContractSponsor, | 211 | SponsorName: queryParam.ContractSponsor, |
@@ -213,8 +213,8 @@ func (cooperationContractService *CooperationContractService) SearchCooperationC | @@ -213,8 +213,8 @@ func (cooperationContractService *CooperationContractService) SearchCooperationC | ||
213 | PageIndex: queryParam.PageSize, | 213 | PageIndex: queryParam.PageSize, |
214 | CompanyId: queryParam.Operator.CompanyId, | 214 | CompanyId: queryParam.Operator.CompanyId, |
215 | }) | 215 | }) |
216 | - data := []dto.CooperationContractUndertake{{}} | ||
217 | - return 10, data, err | 216 | + |
217 | + return result.Grid.Total, result.Grid.List, err | ||
218 | } | 218 | } |
219 | 219 | ||
220 | // 移除共创合约详情 | 220 | // 移除共创合约详情 |
@@ -258,6 +258,22 @@ type ( | @@ -258,6 +258,22 @@ type ( | ||
258 | } | 258 | } |
259 | 259 | ||
260 | DataCooperationContractSearchByUndertaker struct { | 260 | DataCooperationContractSearchByUndertaker struct { |
261 | + Grid struct { | ||
262 | + Total int | ||
263 | + List []struct { | ||
264 | + UndertakerId int64 `json:"undertakerId,string"` // 承接人ID | ||
265 | + UndertakerCode string `json:"undertakerCode"` // 承接人编号 | ||
266 | + UndertakerName string `json:"undertakerName"` // 承接人姓名 | ||
267 | + UndertakerPhone string `json:"undertakerPhone"` // 承接人电话 | ||
268 | + CooperationContractNumber string `json:"cooperationContractNumber"` // 项目合约编号 | ||
269 | + CooperationContractName string `json:"cooperationContractName"` // 项目合约名称 | ||
270 | + Attachment []domain.Attachment `json:"attachment"` // 合同附件 | ||
271 | + SponsorName string `json:"sponsorName"` // 发起人姓名 | ||
272 | + DepartmentName string `json:"departmentName"` // 发起部门名称 | ||
273 | + CooperationModeName string `json:"cooperationModeName"` // 共创模式名称 | ||
274 | + OrgName string `json:"orgName"` // 组织机构名称 | ||
275 | + } | ||
276 | + } | ||
261 | } | 277 | } |
262 | ) | 278 | ) |
263 | 279 |
-
请 注册 或 登录 后发表评论