From 4b03c73db0a6ccb92587c90515a97605075d3bfe Mon Sep 17 00:00:00 2001 From: jhc <9316338+wangyitao309@user.noreply.gitee.com> Date: Tue, 25 Apr 2023 11:56:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20pb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/approval/approval.pb.go | 34 +++++++++++++-------------- api/approval/approval.proto | 4 ++-- api/approval/approval.validator.pb.go | 16 ++++++++----- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/api/approval/approval.pb.go b/api/approval/approval.pb.go index 6c32840..5f258fb 100644 --- a/api/approval/approval.pb.go +++ b/api/approval/approval.pb.go @@ -3870,19 +3870,19 @@ type FinancialFrom struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` - DeletedAt uint64 `protobuf:"varint,2,opt,name=DeletedAt,json=deletedAt,proto3" json:"DeletedAt,omitempty"` - CreatedAt string `protobuf:"bytes,3,opt,name=CreatedAt,json=createdAt,proto3" json:"CreatedAt,omitempty"` - UpdatedAt string `protobuf:"bytes,4,opt,name=UpdatedAt,json=updatedAt,proto3" json:"UpdatedAt,omitempty"` - ApprovalID uint64 `protobuf:"varint,5,opt,name=ApprovalID,json=approvalID,proto3" json:"ApprovalID,omitempty"` - PaymentCompany string `protobuf:"bytes,6,opt,name=PaymentCompany,json=paymentCompany,proto3" json:"PaymentCompany,omitempty"` - TransactionDepartment string `protobuf:"bytes,7,opt,name=TransactionDepartment,json=transactionDepartment,proto3" json:"TransactionDepartment,omitempty"` - Payee string `protobuf:"bytes,8,opt,name=Payee,json=payee,proto3" json:"Payee,omitempty"` - BeneficiaryBank string `protobuf:"bytes,9,opt,name=BeneficiaryBank,json=beneficiaryBank,proto3" json:"BeneficiaryBank,omitempty"` - BankNo string `protobuf:"bytes,10,opt,name=BankNo,json=bankNo,proto3" json:"BankNo,omitempty"` - CostInfo *CostInfo `protobuf:"bytes,11,opt,name=CostInfo,json=costInfo,proto3" json:"CostInfo,omitempty"` - PaymentMethod string `protobuf:"bytes,12,opt,name=PaymentMethod,json=paymentMethod,proto3" json:"PaymentMethod,omitempty"` - InvoiceInfo *InvoiceInfo `protobuf:"bytes,13,opt,name=InvoiceInfo,json=invoiceInfo,proto3" json:"InvoiceInfo,omitempty"` + ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` + DeletedAt uint64 `protobuf:"varint,2,opt,name=DeletedAt,json=deletedAt,proto3" json:"DeletedAt,omitempty"` + CreatedAt string `protobuf:"bytes,3,opt,name=CreatedAt,json=createdAt,proto3" json:"CreatedAt,omitempty"` + UpdatedAt string `protobuf:"bytes,4,opt,name=UpdatedAt,json=updatedAt,proto3" json:"UpdatedAt,omitempty"` + ApprovalID uint64 `protobuf:"varint,5,opt,name=ApprovalID,json=approvalID,proto3" json:"ApprovalID,omitempty"` + PaymentCompany string `protobuf:"bytes,6,opt,name=PaymentCompany,json=paymentCompany,proto3" json:"PaymentCompany,omitempty"` + TransactionDepartment string `protobuf:"bytes,7,opt,name=TransactionDepartment,json=transactionDepartment,proto3" json:"TransactionDepartment,omitempty"` + Payee string `protobuf:"bytes,8,opt,name=Payee,json=payee,proto3" json:"Payee,omitempty"` + BeneficiaryBank string `protobuf:"bytes,9,opt,name=BeneficiaryBank,json=beneficiaryBank,proto3" json:"BeneficiaryBank,omitempty"` + BankNo string `protobuf:"bytes,10,opt,name=BankNo,json=bankNo,proto3" json:"BankNo,omitempty"` + CostInfo []*CostInfo `protobuf:"bytes,11,rep,name=CostInfo,json=costInfo,proto3" json:"CostInfo,omitempty"` + PaymentMethod string `protobuf:"bytes,12,opt,name=PaymentMethod,json=paymentMethod,proto3" json:"PaymentMethod,omitempty"` + InvoiceInfo []*InvoiceInfo `protobuf:"bytes,13,rep,name=InvoiceInfo,json=invoiceInfo,proto3" json:"InvoiceInfo,omitempty"` } func (x *FinancialFrom) Reset() { @@ -3987,7 +3987,7 @@ func (x *FinancialFrom) GetBankNo() string { return "" } -func (x *FinancialFrom) GetCostInfo() *CostInfo { +func (x *FinancialFrom) GetCostInfo() []*CostInfo { if x != nil { return x.CostInfo } @@ -4001,7 +4001,7 @@ func (x *FinancialFrom) GetPaymentMethod() string { return "" } -func (x *FinancialFrom) GetInvoiceInfo() *InvoiceInfo { +func (x *FinancialFrom) GetInvoiceInfo() []*InvoiceInfo { if x != nil { return x.InvoiceInfo } @@ -4747,13 +4747,13 @@ var file_api_approval_approval_proto_rawDesc = []byte{ 0x09, 0x52, 0x0f, 0x62, 0x65, 0x6e, 0x65, 0x66, 0x69, 0x63, 0x69, 0x61, 0x72, 0x79, 0x42, 0x61, 0x6e, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x61, 0x6e, 0x6b, 0x4e, 0x6f, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x61, 0x6e, 0x6b, 0x4e, 0x6f, 0x12, 0x2e, 0x0a, 0x08, 0x43, 0x6f, - 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61, + 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x61, 0x6c, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x37, 0x0a, 0x0b, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x18, - 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x61, 0x6c, + 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x61, 0x6c, 0x2e, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xc8, 0x01, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, diff --git a/api/approval/approval.proto b/api/approval/approval.proto index bb64524..3e07f1a 100644 --- a/api/approval/approval.proto +++ b/api/approval/approval.proto @@ -442,9 +442,9 @@ message FinancialFrom { string Payee = 8 [json_name = "payee"]; string BeneficiaryBank = 9 [json_name = "beneficiaryBank"]; string BankNo = 10 [json_name = "bankNo"]; - CostInfo CostInfo = 11 [json_name = "costInfo"]; + repeated CostInfo CostInfo = 11 [json_name = "costInfo"]; string PaymentMethod = 12 [json_name = "paymentMethod"]; - InvoiceInfo InvoiceInfo = 13 [json_name = "invoiceInfo"]; + repeated InvoiceInfo InvoiceInfo = 13 [json_name = "invoiceInfo"]; } message CostInfo { diff --git a/api/approval/approval.validator.pb.go b/api/approval/approval.validator.pb.go index 0efcdb5..163f0a4 100644 --- a/api/approval/approval.validator.pb.go +++ b/api/approval/approval.validator.pb.go @@ -337,14 +337,18 @@ func (this *GetNameResponse) Validate() error { return nil } func (this *FinancialFrom) Validate() error { - if this.CostInfo != nil { - if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.CostInfo); err != nil { - return github_com_mwitkow_go_proto_validators.FieldError("CostInfo", err) + for _, item := range this.CostInfo { + if item != nil { + if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil { + return github_com_mwitkow_go_proto_validators.FieldError("CostInfo", err) + } } } - if this.InvoiceInfo != nil { - if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.InvoiceInfo); err != nil { - return github_com_mwitkow_go_proto_validators.FieldError("InvoiceInfo", err) + for _, item := range this.InvoiceInfo { + if item != nil { + if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil { + return github_com_mwitkow_go_proto_validators.FieldError("InvoiceInfo", err) + } } } return nil