From 087ca51e06b2974f1226452df62ab7c41a474c76 Mon Sep 17 00:00:00 2001 From: songchuang <192749120@qq.com> Date: Fri, 24 Mar 2023 10:58:37 +0800 Subject: [PATCH] =?UTF-8?q?contract=20=E8=A1=A8=20=E5=AD=97=E6=AE=B5batchn?= =?UTF-8?q?ame=E6=94=B9=E4=B8=BAbatchtime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/internal/logic/contract.go | 2 +- cmd/model/contract.go | 2 +- cmd/model/statement.go | 2 +- pb/contract/contract.pb.go | 10 +++++----- pb/contract/contract.proto | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/internal/logic/contract.go b/cmd/internal/logic/contract.go index 519570f..6383730 100644 --- a/cmd/internal/logic/contract.go +++ b/cmd/internal/logic/contract.go @@ -258,7 +258,7 @@ func (a *Contract) GetContractInfoByContractUid(req *contract.GetContractInfoByC Status: contractInfo.Status, LockTime: contractInfo.LockTime, SignTime: contractInfo.SignTime, - BatchName: contractInfo.BatchName, + BatchTime: contractInfo.BatchTime, BatchUid: contractInfo.BatchUid, StType: contractInfo.StType, } diff --git a/cmd/model/contract.go b/cmd/model/contract.go index 4f7cf5d..9bbfccf 100644 --- a/cmd/model/contract.go +++ b/cmd/model/contract.go @@ -17,7 +17,7 @@ type Contract struct { Status int32 `gorm:"column:status;default:2;comment:2=锁定 3=解锁" json:"status" ` //跟随用户的锁定和解锁状态,用于控制数据的展示 LockTime string `gorm:"column:lock_time;comment:锁定时间" json:"lockTime"` SignTime string `gorm:"column:sign_time;comment:签署时间" json:"sign_time"` - BatchName string `gorm:"column:batch_name;comment:批次名" json:"batch_name"` + BatchTime string `gorm:"column:batch_time;comment:批次时间" json:"batch_time"` BatchUid string `gorm:"column:batch_uid;comment:批次ID" json:"batch_uid"` StType int32 `gorm:"column:st_type;unqiueIndex:sttype_uid_batchtime_idx;comment:对账单类型 1=版权 2=物权;"` ArtworkTx *ArtworkTx `gorm:"foreignKey:BatchUid;references:Uid"` //当前批次的物权委托单 diff --git a/cmd/model/statement.go b/cmd/model/statement.go index b2edf6a..e09c9de 100644 --- a/cmd/model/statement.go +++ b/cmd/model/statement.go @@ -8,7 +8,7 @@ type ArtworkTx struct { Uid string `gorm:"column:uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次Uid;NOT NULL" json:"uid"` ArtistUid string `gorm:"column:artist_uid;type:varchar(100);comment:画家Uid;NOT NULL" json:"artist_uid"` ArtistName string `gorm:"column:artist_name;type:varchar(100);comment:画家名;NOT NULL" json:"artist_name"` - BatchName string `gorm:"column:batch_name;comment:批次名" json:"batch_name"` + BatchTime string `gorm:"column:batch_time;comment:批次时间" json:"batch_time"` CreatedAt int32 `gorm:"column:created_at;autoCreateTime"` UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"` DeletedAt soft_delete.DeletedAt diff --git a/pb/contract/contract.pb.go b/pb/contract/contract.pb.go index 10cdb2e..a79a7f2 100644 --- a/pb/contract/contract.pb.go +++ b/pb/contract/contract.pb.go @@ -38,7 +38,7 @@ type Contracts struct { ExpirationTime string `protobuf:"bytes,11,opt,name=ExpirationTime,json=expiration_time,proto3" json:"ExpirationTime,omitempty"` LockTime string `protobuf:"bytes,12,opt,name=LockTime,json=lock_time,proto3" json:"LockTime,omitempty"` SignTime string `protobuf:"bytes,13,opt,name=SignTime,json=sign_time,proto3" json:"SignTime,omitempty"` - BatchName string `protobuf:"bytes,14,opt,name=BatchName,json=batch_name,proto3" json:"BatchName,omitempty"` + BatchTime string `protobuf:"bytes,14,opt,name=BatchTime,json=batch_time,proto3" json:"BatchTime,omitempty"` BatchUid string `protobuf:"bytes,15,opt,name=BatchUid,json=batch_uid,proto3" json:"BatchUid,omitempty"` StType int32 `protobuf:"varint,16,opt,name=StType,json=st_yype,proto3" json:"StType,omitempty"` } @@ -166,9 +166,9 @@ func (x *Contracts) GetSignTime() string { return "" } -func (x *Contracts) GetBatchName() string { +func (x *Contracts) GetBatchTime() string { if x != nil { - return x.BatchName + return x.BatchTime } return "" } @@ -1429,8 +1429,8 @@ var file_contract_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x08, 0x53, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x09, - 0x42, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x08, 0x42, + 0x42, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x08, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x06, 0x53, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x5f, 0x79, 0x79, 0x70, diff --git a/pb/contract/contract.proto b/pb/contract/contract.proto index 1c95436..0ad8ebb 100644 --- a/pb/contract/contract.proto +++ b/pb/contract/contract.proto @@ -31,7 +31,7 @@ message Contracts{ string ExpirationTime = 11 [json_name = "expiration_time"]; string LockTime = 12 [json_name = "lock_time"]; string SignTime = 13 [json_name = "sign_time"]; - string BatchName = 14 [json_name = "batch_name"]; + string BatchTime = 14 [json_name = "batch_time"]; string BatchUid = 15 [json_name = "batch_uid"]; int32 StType = 16 [json_name = "st_yype"]; }