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

转到一个项目

作者 yangfu
提交 33e2d74e6831228e8be6dffd09f96a01b7ff1afb 2 个父辈 db152c50 8aff825b

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

内嵌 并排对比
正在显示 6 个修改的文件 包含 35 行增加 和 35 行删除
@@ -110,6 +110,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery @@ -110,6 +110,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery
110 PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的 110 PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
111 PageSize: projectQuery.PageSize, 111 PageSize: projectQuery.PageSize,
112 OrgId: projectQuery.OrgId, 112 OrgId: projectQuery.OrgId,
  113 + Status: 1, //搜索状态为“招标中”项目
113 //UserBaseId: projectQuery.Operator.UserBaseId, 114 //UserBaseId: projectQuery.Operator.UserBaseId,
114 }) 115 })
115 if err != nil { 116 if err != nil {
@@ -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 // 移除共创合约详情
@@ -14,6 +14,7 @@ type CreditAccountItem struct { @@ -14,6 +14,7 @@ type CreditAccountItem struct {
14 SettlementAmount float64 `json:"settlementAmount"` // 账期结算金额 14 SettlementAmount float64 `json:"settlementAmount"` // 账期结算金额
15 SettlementTime int64 `json:"settlementTime"` // 共创账期结算时间 15 SettlementTime int64 `json:"settlementTime"` // 共创账期结算时间
16 CooperationContractNumber string `json:"cooperationContractNumber"` // 关联共创合约编号 16 CooperationContractNumber string `json:"cooperationContractNumber"` // 关联共创合约编号
  17 + Remarks string `json:"remarks"`
17 Participator struct { 18 Participator struct {
18 UserName string `json:"userName"` // 用户姓名 19 UserName string `json:"userName"` // 用户姓名
19 UserPhone string `json:"userPhone"` // 用户手机号 20 UserPhone string `json:"userPhone"` // 用户手机号
@@ -63,13 +64,14 @@ func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount, opera @@ -63,13 +64,14 @@ func ToCreditAccountItem(param *allied_creation_cooperation.CreditAccount, opera
63 CreatedAt: param.CreatedAt.UnixNano() / 1e6, // 创建时间 64 CreatedAt: param.CreatedAt.UnixNano() / 1e6, // 创建时间
64 UpdatedAt: param.UpdatedAt.UnixNano() / 1e6, // 更新时间 65 UpdatedAt: param.UpdatedAt.UnixNano() / 1e6, // 更新时间
65 AccountDetail: param.AccountDetail, 66 AccountDetail: param.AccountDetail,
  67 + Remarks: param.Remarks,
66 AuthFlag: param.Org.OrgID == int(operatorOrgId), 68 AuthFlag: param.Org.OrgID == int(operatorOrgId),
67 } 69 }
68 if !param.PaymentTime.IsZero() { 70 if !param.PaymentTime.IsZero() {
69 data.PaymentTime = param.PaymentTime.UnixNano() / 1e6 71 data.PaymentTime = param.PaymentTime.UnixNano() / 1e6
70 } 72 }
71 if !param.SettlementTime.IsZero() { 73 if !param.SettlementTime.IsZero() {
72 - data.SettlementTime = param.PaymentTime.UnixNano() / 1e6 74 + data.SettlementTime = param.SettlementTime.Unix() * 1e3
73 } 75 }
74 if len(param.PaymentDocumentAttachment.Url) > 0 { 76 if len(param.PaymentDocumentAttachment.Url) > 0 {
75 data.PaymentDocumentAttachment = &param.PaymentDocumentAttachment 77 data.PaymentDocumentAttachment = &param.PaymentDocumentAttachment
@@ -24,7 +24,7 @@ func (dividendsEstimateService *DividendsEstimateService) CancelDividendsEstimat @@ -24,7 +24,7 @@ func (dividendsEstimateService *DividendsEstimateService) CancelDividendsEstimat
24 return cancelDividendsEstimateCommand, nil 24 return cancelDividendsEstimateCommand, nil
25 } 25 }
26 26
27 -// 确定预算分红激励 27 +// 确定预算业绩分红激励
28 func (dividendsEstimateService *DividendsEstimateService) EstimateDividendsIncentives(estimateDividendsIncentivesCommand *command.EstimateDividendsIncentivesCommand) (interface{}, error) { 28 func (dividendsEstimateService *DividendsEstimateService) EstimateDividendsIncentives(estimateDividendsIncentivesCommand *command.EstimateDividendsIncentivesCommand) (interface{}, error) {
29 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 29 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
30 estimateDividendsIncentivesCommand.Operator) 30 estimateDividendsIncentivesCommand.Operator)
@@ -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