Merge branch 'jhc' into dev

api/approval/approval.pb.go

@@ -2641,7 +2641,7 @@ type CreateRequest struct {
 	TypeName       string          `protobuf:"bytes,28,opt,name=TypeName,json=typeName,proto3" json:"TypeName,omitempty"`
 	GroupName      string          `protobuf:"bytes,29,opt,name=GroupName,json=groupName,proto3" json:"GroupName,omitempty"`
 	BundlePayPrice *BundlePayPrice `protobuf:"bytes,30,opt,name=BundlePayPrice,json=bundlePayPrice,proto3" json:"BundlePayPrice,omitempty"`
-	FinancialFrom  *FinancialFrom  `protobuf:"bytes,31,opt,name=FinancialFrom,json=financialFrom,proto3" json:"FinancialFrom,omitempty"`
+	FinancialForm  *FinancialForm  `protobuf:"bytes,31,opt,name=FinancialForm,json=financialForm,proto3" json:"FinancialForm,omitempty"`
 }
 
 func (x *CreateRequest) Reset() {
@@ -2872,9 +2872,9 @@ func (x *CreateRequest) GetBundlePayPrice() *BundlePayPrice {
 	return nil
 }
 
-func (x *CreateRequest) GetFinancialFrom() *FinancialFrom {
+func (x *CreateRequest) GetFinancialForm() *FinancialForm {
 	if x != nil {
-		return x.FinancialFrom
+		return x.FinancialForm
 	}
 	return nil
 }
@@ -3865,7 +3865,7 @@ func (x *GetNameResponse) GetName() []string {
 	return nil
 }
 
-type FinancialFrom struct {
+type FinancialForm struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -3885,8 +3885,8 @@ type FinancialFrom struct {
 	InvoiceInfo           []*InvoiceInfo `protobuf:"bytes,13,rep,name=InvoiceInfo,json=invoiceInfo,proto3" json:"InvoiceInfo,omitempty"`
 }
 
-func (x *FinancialFrom) Reset() {
-	*x = FinancialFrom{}
+func (x *FinancialForm) Reset() {
+	*x = FinancialForm{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_api_approval_approval_proto_msgTypes[50]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -3894,13 +3894,13 @@ func (x *FinancialFrom) Reset() {
 	}
 }
 
-func (x *FinancialFrom) String() string {
+func (x *FinancialForm) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FinancialFrom) ProtoMessage() {}
+func (*FinancialForm) ProtoMessage() {}
 
-func (x *FinancialFrom) ProtoReflect() protoreflect.Message {
+func (x *FinancialForm) ProtoReflect() protoreflect.Message {
 	mi := &file_api_approval_approval_proto_msgTypes[50]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -3912,96 +3912,96 @@ func (x *FinancialFrom) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FinancialFrom.ProtoReflect.Descriptor instead.
-func (*FinancialFrom) Descriptor() ([]byte, []int) {
+// Deprecated: Use FinancialForm.ProtoReflect.Descriptor instead.
+func (*FinancialForm) Descriptor() ([]byte, []int) {
 	return file_api_approval_approval_proto_rawDescGZIP(), []int{50}
 }
 
-func (x *FinancialFrom) GetID() uint64 {
+func (x *FinancialForm) GetID() uint64 {
 	if x != nil {
 		return x.ID
 	}
 	return 0
 }
 
-func (x *FinancialFrom) GetDeletedAt() uint64 {
+func (x *FinancialForm) GetDeletedAt() uint64 {
 	if x != nil {
 		return x.DeletedAt
 	}
 	return 0
 }
 
-func (x *FinancialFrom) GetCreatedAt() string {
+func (x *FinancialForm) GetCreatedAt() string {
 	if x != nil {
 		return x.CreatedAt
 	}
 	return ""
 }
 
-func (x *FinancialFrom) GetUpdatedAt() string {
+func (x *FinancialForm) GetUpdatedAt() string {
 	if x != nil {
 		return x.UpdatedAt
 	}
 	return ""
 }
 
-func (x *FinancialFrom) GetApprovalID() uint64 {
+func (x *FinancialForm) GetApprovalID() uint64 {
 	if x != nil {
 		return x.ApprovalID
 	}
 	return 0
 }
 
-func (x *FinancialFrom) GetPaymentCompany() string {
+func (x *FinancialForm) GetPaymentCompany() string {
 	if x != nil {
 		return x.PaymentCompany
 	}
 	return ""
 }
 
-func (x *FinancialFrom) GetTransactionDepartment() string {
+func (x *FinancialForm) GetTransactionDepartment() string {
 	if x != nil {
 		return x.TransactionDepartment
 	}
 	return ""
 }
 
-func (x *FinancialFrom) GetPayee() string {
+func (x *FinancialForm) GetPayee() string {
 	if x != nil {
 		return x.Payee
 	}
 	return ""
 }
 
-func (x *FinancialFrom) GetBeneficiaryBank() string {
+func (x *FinancialForm) GetBeneficiaryBank() string {
 	if x != nil {
 		return x.BeneficiaryBank
 	}
 	return ""
 }
 
-func (x *FinancialFrom) GetBankNo() string {
+func (x *FinancialForm) GetBankNo() string {
 	if x != nil {
 		return x.BankNo
 	}
 	return ""
 }
 
-func (x *FinancialFrom) GetCostInfo() []*CostInfo {
+func (x *FinancialForm) GetCostInfo() []*CostInfo {
 	if x != nil {
 		return x.CostInfo
 	}
 	return nil
 }
 
-func (x *FinancialFrom) GetPaymentMethod() string {
+func (x *FinancialForm) GetPaymentMethod() string {
 	if x != nil {
 		return x.PaymentMethod
 	}
 	return ""
 }
 
-func (x *FinancialFrom) GetInvoiceInfo() []*InvoiceInfo {
+func (x *FinancialForm) GetInvoiceInfo() []*InvoiceInfo {
 	if x != nil {
 		return x.InvoiceInfo
 	}
@@ -4619,10 +4619,10 @@ var file_api_approval_approval_proto_rawDesc = []byte{
 	0x32, 0x18, 0x2e, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x61, 0x6c, 0x2e, 0x42, 0x75, 0x6e, 0x64,
 	0x6c, 0x65, 0x50, 0x61, 0x79, 0x50, 0x72, 0x69, 0x63, 0x65, 0x52, 0x0e, 0x62, 0x75, 0x6e, 0x64,
 	0x6c, 0x65, 0x50, 0x61, 0x79, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x3d, 0x0a, 0x0d, 0x46, 0x69,
-	0x6e, 0x61, 0x6e, 0x63, 0x69, 0x61, 0x6c, 0x46, 0x72, 0x6f, 0x6d, 0x18, 0x1f, 0x20, 0x01, 0x28,
+	0x6e, 0x61, 0x6e, 0x63, 0x69, 0x61, 0x6c, 0x46, 0x6f, 0x72, 0x6d, 0x18, 0x1f, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x17, 0x2e, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x61, 0x6c, 0x2e, 0x46, 0x69, 0x6e,
-	0x61, 0x6e, 0x63, 0x69, 0x61, 0x6c, 0x46, 0x72, 0x6f, 0x6d, 0x52, 0x0d, 0x66, 0x69, 0x6e, 0x61,
-	0x6e, 0x63, 0x69, 0x61, 0x6c, 0x46, 0x72, 0x6f, 0x6d, 0x22, 0xaa, 0x01, 0x0a, 0x08, 0x57, 0x6f,
+	0x61, 0x6e, 0x63, 0x69, 0x61, 0x6c, 0x46, 0x6f, 0x72, 0x6d, 0x52, 0x0d, 0x66, 0x69, 0x6e, 0x61,
+	0x6e, 0x63, 0x69, 0x61, 0x6c, 0x46, 0x6f, 0x72, 0x6d, 0x22, 0xaa, 0x01, 0x0a, 0x08, 0x57, 0x6f,
 	0x72, 0x6b, 0x46, 0x6c, 0x6f, 0x77, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x04, 0x52, 0x02, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44,
 	0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x12,
@@ -4726,7 +4726,7 @@ var file_api_approval_approval_proto_rawDesc = []byte{
 	0x65, 0x22, 0x25, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70,
 	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x03,
 	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xde, 0x03, 0x0a, 0x0d, 0x46, 0x69, 0x6e,
-	0x61, 0x6e, 0x63, 0x69, 0x61, 0x6c, 0x46, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44,
+	0x61, 0x6e, 0x63, 0x69, 0x61, 0x6c, 0x46, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x44, 0x65,
 	0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x64,
 	0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61,
@@ -4960,7 +4960,7 @@ var file_api_approval_approval_proto_goTypes = []interface{}{
 	(*SettingResponse)(nil),           // 47: approval.SettingResponse
 	(*GetNameRequest)(nil),            // 48: approval.GetNameRequest
 	(*GetNameResponse)(nil),           // 49: approval.GetNameResponse
-	(*FinancialFrom)(nil),             // 50: approval.FinancialFrom
+	(*FinancialForm)(nil),             // 50: approval.FinancialForm
 	(*CostInfo)(nil),                  // 51: approval.CostInfo
 	(*InvoiceInfo)(nil),               // 52: approval.InvoiceInfo
 }
@@ -4986,12 +4986,12 @@ var file_api_approval_approval_proto_depIdxs = []int32{
 	35, // 18: approval.CreateRequest.WorkFlows:type_name -> approval.WorkFlow
 	4,  // 19: approval.CreateRequest.CustomizeInfo:type_name -> approval.KeyInfo
 	33, // 20: approval.CreateRequest.BundlePayPrice:type_name -> approval.BundlePayPrice
-	50, // 21: approval.CreateRequest.FinancialFrom:type_name -> approval.FinancialFrom
+	50, // 21: approval.CreateRequest.FinancialForm:type_name -> approval.FinancialForm
 	43, // 22: approval.SettingRequest.CopyUsers:type_name -> approval.CopyUser
 	44, // 23: approval.SettingRequest.ApprovalUsers:type_name -> approval.ApprovalUser
 	4,  // 24: approval.SettingRequest.CustomizeInfo:type_name -> approval.KeyInfo
-	51, // 25: approval.FinancialFrom.CostInfo:type_name -> approval.CostInfo
-	52, // 26: approval.FinancialFrom.InvoiceInfo:type_name -> approval.InvoiceInfo
+	51, // 25: approval.FinancialForm.CostInfo:type_name -> approval.CostInfo
+	52, // 26: approval.FinancialForm.InvoiceInfo:type_name -> approval.InvoiceInfo
 	34, // 27: approval.Approval.Create:input_type -> approval.CreateRequest
 	7,  // 28: approval.Approval.UsedNumByUser:input_type -> approval.UsedNumByUserRequest
 	5,  // 29: approval.Approval.UpdateExhibitionApplyID:input_type -> approval.UpdateEhApplyIDRequest
@@ -5652,7 +5652,7 @@ func file_api_approval_approval_proto_init() {
 			}
 		}
 		file_api_approval_approval_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FinancialFrom); i {
+			switch v := v.(*FinancialForm); i {
 			case 0:
 				return &v.state
 			case 1:

api/approval/approval.proto

@@ -329,7 +329,7 @@ message CreateRequest {
  string TypeName                     = 28  [json_name = "typeName"];
  string GroupName                    = 29  [json_name = "groupName"];
  BundlePayPrice     BundlePayPrice   = 30  [json_name = "bundlePayPrice"];
- FinancialFrom      FinancialFrom    = 31  [json_name = "financialFrom"];
+ FinancialForm      FinancialForm    = 31  [json_name = "financialForm"];
 }
 
 message WorkFlow {
@@ -431,7 +431,7 @@ message GetNameResponse {
  repeated string Name = 1 [json_name = "name"];
 }
 
-message FinancialFrom {
+message FinancialForm {
  uint64 ID=1 [json_name = "ID"];
  uint64 DeletedAt=2 [json_name = "deletedAt"];
  string CreatedAt=3 [json_name = "createdAt"];

api/approval/approval.validator.pb.go

@@ -263,9 +263,9 @@ func (this *CreateRequest) Validate() error {
 			return github_com_mwitkow_go_proto_validators.FieldError("BundlePayPrice", err)
 		}
 	}
-	if this.FinancialFrom != nil {
-		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.FinancialFrom); err != nil {
-			return github_com_mwitkow_go_proto_validators.FieldError("FinancialFrom", err)
+	if this.FinancialForm != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.FinancialForm); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("FinancialForm", err)
 		}
 	}
 	return nil
@@ -336,7 +336,7 @@ func (this *GetNameRequest) Validate() error {
 func (this *GetNameResponse) Validate() error {
 	return nil
 }
-func (this *FinancialFrom) Validate() error {
+func (this *FinancialForm) Validate() error {
 	for _, item := range this.CostInfo {
 		if item != nil {
 			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {

pkg/model/approval.go

@@ -51,7 +51,7 @@ type Approval struct {
 	BundlePayPrice    *BundlePayPrice       `gorm:"foreignKey:ApprovalID" json:"BundlePayPrice"`   //关联的type
 	ExhibitionReward  *ExhibitionReward     `gorm:"foreignKey:ApprovalID" json:"ExhibitionReward"` //关联的type
 	ApprovalWorkFlows []*ApprovalWorkFlow   `gorm:"foreignKey:ApprovalID" json:"ApprovalWorkFlows"`
-	FinancialFrom     *FinancialFrom        `gorm:"foreignKey:ApprovalID" json:"financialFrom"`
+	FinancialForm     *FinancialForm        `gorm:"foreignKey:ApprovalID" json:"financialFrom"`
 }
 
 func (j *KeyInfos) Scan(src interface{}) error {
@@ -536,7 +536,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		Preload("ExhibitionReward.ApprovalExhibitions").
 		Preload("ApprovalWorkFlows").
 		Preload("Exhibition.ApprovalExhibitions").
-		Preload("FinancialFrom")
+		Preload("FinancialForm")
 
 	//我未阅读的和我未操作的
 	DB.Model(&Approval{}).Where(&Approval{Type: in.Type}).Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}).Order("id desc").Select("id").Find(&ids)
@@ -574,7 +574,7 @@ func MyApprovalWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		Preload("ApprovalType.ApprovalTypeGroup").
 		Preload("ApprovalWorkFlows").
 		Preload("Exhibition.ApprovalExhibitions").
-		Preload("FinancialFrom")
+		Preload("FinancialForm")
 
 	if in.Type != "" {
 		modelObj = modelObj.Where(&Approval{Type: in.Type})
@@ -632,7 +632,7 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		Preload("ExhibitionReward.ApprovalExhibitions").
 		Preload("ApprovalWorkFlows").
 		Preload("Exhibition.ApprovalExhibitions").
-		Preload("FinancialFrom")
+		Preload("FinancialForm")
 
 	if in.Type != "" {
 		modelObj = modelObj.Where(&Approval{Type: in.Type})
@@ -689,7 +689,7 @@ func MySubmitApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		Preload("ExhibitionReward.ApprovalExhibitions").
 		Preload("ApprovalType.ApprovalTypeGroup").
 		Preload("Exhibition.ApprovalExhibitions").
-		Preload("FinancialFrom")
+		Preload("FinancialForm")
 
 	if in.Status != 0 {
 		modelObj = modelObj.Where(&Approval{Status: int8(in.Status)})
@@ -722,7 +722,7 @@ func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		Preload("ExhibitionReward.ApprovalExhibitions").
 		Preload("ApprovalType.ApprovalTypeGroup").
 		Preload("Exhibition.ApprovalExhibitions").
-		Preload("FinancialFrom")
+		Preload("FinancialForm")
 
 	if in.Type != "" {
 		modelObj = modelObj.Where(&Approval{Type: in.Type})
@@ -811,7 +811,7 @@ func getApprovalContentFactory(typeFiled string) (ApprovalContentInterface, erro
 	case TypeArtExhibitionReward:
 		return &ExhibitionReward{}, nil
 	case TypeFinancialForm:
-		return &FinancialFrom{}, nil
+		return &FinancialForm{}, nil
 	default:
 		return &Approval{}, nil
 	}

pkg/model/financial_form.go

@@ -9,7 +9,7 @@ import (
 	"time"
 )
 
-type FinancialFrom struct {
+type FinancialForm struct {
 	ID                    uint64                `gorm:"primaryKey;column:id" json:"id"`     // ID
 	DeletedAt             soft_delete.DeletedAt `gorm:"column:deleted_at" json:"deletedAt"` // 删除时间
 	CreatedAt             time.Time             `gorm:"column:created_at" json:"createdAt"` // 创建时间
@@ -48,17 +48,17 @@ type InvoiceInfo struct {
 }
 
 // TableName get sql table name.获取数据库表名
-func (m *FinancialFrom) TableName() string {
-	return "financial_from"
+func (m *FinancialForm) TableName() string {
+	return "financial_form"
 }
 
-func (m *FinancialFrom) GetApproval(id uint64) (*Approval, error) {
+func (m *FinancialForm) GetApproval(id uint64) (*Approval, error) {
 
 	var entity *Approval
 	if err := DB.
 		Preload("ApprovalWorkFlows").
 		Preload("ApprovalType").
-		Preload("FinancialFrom").
+		Preload("FinancialForm").
 		First(&entity, id).Error; err != nil {
 		return entity, err
 	}
@@ -66,22 +66,22 @@ func (m *FinancialFrom) GetApproval(id uint64) (*Approval, error) {
 	return entity, nil
 }
 
-func (m *FinancialFrom) SaveApprovalContent(in *approval.CreateRequest, a *Approval) error {
+func (m *FinancialForm) SaveApprovalContent(in *approval.CreateRequest, a *Approval) error {
 
-	copier.CopyWithOption(&m, in.FinancialFrom, copier.Option{DeepCopy: true})
+	copier.CopyWithOption(&m, in.FinancialForm, copier.Option{DeepCopy: true})
 	m.ApprovalID = a.ID
 	costInfos := make([]*CostInfo, 0)
-	for i := 0; i < len(in.FinancialFrom.CostInfo); i++ {
+	for i := 0; i < len(in.FinancialForm.CostInfo); i++ {
 		costInfo := new(CostInfo)
-		copier.CopyWithOption(&costInfo, in.FinancialFrom.CostInfo[i], copier.Option{DeepCopy: true})
+		copier.CopyWithOption(&costInfo, in.FinancialForm.CostInfo[i], copier.Option{DeepCopy: true})
 		costInfos = append(costInfos, costInfo)
 	}
 	m.CostInfo = costInfos
 
 	invoiceInfos := make([]*InvoiceInfo, 0)
-	for i := 0; i < len(in.FinancialFrom.InvoiceInfo); i++ {
+	for i := 0; i < len(in.FinancialForm.InvoiceInfo); i++ {
 		invoiceInfo := new(InvoiceInfo)
-		copier.CopyWithOption(&invoiceInfo, in.FinancialFrom.InvoiceInfo[i], copier.Option{DeepCopy: true})
+		copier.CopyWithOption(&invoiceInfo, in.FinancialForm.InvoiceInfo[i], copier.Option{DeepCopy: true})
 		invoiceInfos = append(invoiceInfos, invoiceInfo)
 	}
 	m.InvoiceInfo = invoiceInfos
@@ -89,29 +89,29 @@ func (m *FinancialFrom) SaveApprovalContent(in *approval.CreateRequest, a *Appro
 	return DB.Create(&m).Error
 }
 
-func (m *FinancialFrom) UpdateApprovalContent(in *approval.CreateRequest, a *Approval) error {
+func (m *FinancialForm) UpdateApprovalContent(in *approval.CreateRequest, a *Approval) error {
 
-	var entity *FinancialFrom
+	var entity *FinancialForm
 
-	if err := DB.Where(&FinancialFrom{ApprovalID: a.ID}).First(&entity).Error; err != nil {
+	if err := DB.Where(&FinancialForm{ApprovalID: a.ID}).First(&entity).Error; err != nil {
 		return errors.New(m2.ErrorNotFound)
 	}
 
-	copier.CopyWithOption(&m, in.FinancialFrom, copier.Option{DeepCopy: true})
+	copier.CopyWithOption(&m, in.FinancialForm, copier.Option{DeepCopy: true})
 	m.ID = entity.ID
 
 	costInfos := make([]*CostInfo, 0)
-	for i := 0; i < len(in.FinancialFrom.CostInfo); i++ {
+	for i := 0; i < len(in.FinancialForm.CostInfo); i++ {
 		costInfo := new(CostInfo)
-		copier.CopyWithOption(&costInfo, in.FinancialFrom.CostInfo[i], copier.Option{DeepCopy: true})
+		copier.CopyWithOption(&costInfo, in.FinancialForm.CostInfo[i], copier.Option{DeepCopy: true})
 		costInfos = append(costInfos, costInfo)
 	}
 	m.CostInfo = costInfos
 
 	invoiceInfos := make([]*InvoiceInfo, 0)
-	for i := 0; i < len(in.FinancialFrom.InvoiceInfo); i++ {
+	for i := 0; i < len(in.FinancialForm.InvoiceInfo); i++ {
 		invoiceInfo := new(InvoiceInfo)
-		copier.CopyWithOption(&invoiceInfo, in.FinancialFrom.InvoiceInfo[i], copier.Option{DeepCopy: true})
+		copier.CopyWithOption(&invoiceInfo, in.FinancialForm.InvoiceInfo[i], copier.Option{DeepCopy: true})
 		invoiceInfos = append(invoiceInfos, invoiceInfo)
 	}
 	m.InvoiceInfo = invoiceInfos
@@ -119,31 +119,34 @@ func (m *FinancialFrom) UpdateApprovalContent(in *approval.CreateRequest, a *App
 	return DB.Model(&m).Updates(m).Error
 }
 
-func (m *FinancialFrom) BuildResContent(a *Approval, request *approval.CreateRequest) {
+func (m *FinancialForm) BuildResContent(a *Approval, request *approval.CreateRequest) {
 
-	if a.FinancialFrom != nil {
-		copier.CopyWithOption(&request.FinancialFrom, a.FinancialFrom, copier.Option{DeepCopy: true})
+	if a.FinancialForm != nil {
+		financialForm := new(approval.FinancialForm)
+		copier.CopyWithOption(&financialForm, a.FinancialForm, copier.Option{DeepCopy: true})
 
 		costInfos := make([]*approval.CostInfo, 0)
-		for i := 0; i < len(a.FinancialFrom.CostInfo); i++ {
+		for i := 0; i < len(a.FinancialForm.CostInfo); i++ {
 			costInfo := new(approval.CostInfo)
-			copier.CopyWithOption(&costInfo, a.FinancialFrom.CostInfo[i], copier.Option{DeepCopy: true})
+			copier.CopyWithOption(&costInfo, a.FinancialForm.CostInfo[i], copier.Option{DeepCopy: true})
 			costInfos = append(costInfos, costInfo)
 		}
 
-		request.FinancialFrom.CostInfo = costInfos
+		financialForm.CostInfo = costInfos
 
 		invoiceInfos := make([]*approval.InvoiceInfo, 0)
-		for i := 0; i < len(a.FinancialFrom.InvoiceInfo); i++ {
+		for i := 0; i < len(a.FinancialForm.InvoiceInfo); i++ {
 			invoiceInfo := new(approval.InvoiceInfo)
-			copier.CopyWithOption(&invoiceInfo, a.FinancialFrom.InvoiceInfo[i], copier.Option{DeepCopy: true})
+			copier.CopyWithOption(&invoiceInfo, a.FinancialForm.InvoiceInfo[i], copier.Option{DeepCopy: true})
 			invoiceInfos = append(invoiceInfos, invoiceInfo)
 		}
 
-		request.FinancialFrom.InvoiceInfo = invoiceInfos
+		financialForm.InvoiceInfo = invoiceInfos
+
+		request.FinancialForm = financialForm
 	}
 }
 
-func (m *FinancialFrom) DeleteApproval(p *Approval) error {
-	return DB.Where(&FinancialFrom{ApprovalID: p.ID}).Delete(&FinancialFrom{}).Error
+func (m *FinancialForm) DeleteApproval(p *Approval) error {
+	return DB.Where(&FinancialForm{ApprovalID: p.ID}).Delete(&FinancialForm{}).Error
 }

pkg/model/migration.go

@@ -14,7 +14,7 @@ func migration() {
 	addTable(&ApprovalReward{})
 
 	addTable(&FinancialFormSetting{}) // 财务报表审批 设置信息
-	addTable(&FinancialFrom{})        // 财务报表审批 设置信息
+	addTable(&FinancialForm{})        // 财务报表审批 设置信息
 
 	//增加字段
 	addColumn(&ApprovalType{}, "is_normal")