diff --git a/api/reports/reports.pb.go b/api/reports/reports.pb.go index e57bb01..fba2079 100644 --- a/api/reports/reports.pb.go +++ b/api/reports/reports.pb.go @@ -225,7 +225,7 @@ type AnnualReport struct { Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //id FileName string `protobuf:"bytes,2,opt,name=fileName,proto3" json:"fileName"` //文件名称 - Date string `protobuf:"bytes,3,opt,name=date,proto3" json:"date"` //日期 + Date int64 `protobuf:"varint,3,opt,name=date,proto3" json:"date"` //日期 FileUrl string `protobuf:"bytes,4,opt,name=fileUrl,proto3" json:"fileUrl"` //访问地址 Status int32 `protobuf:"varint,5,opt,name=status,proto3" json:"status"` //状态(1:上架,2:下架) Sort int32 `protobuf:"varint,6,opt,name=sort,proto3" json:"sort"` //排序 @@ -280,11 +280,11 @@ func (x *AnnualReport) GetFileName() string { return "" } -func (x *AnnualReport) GetDate() string { +func (x *AnnualReport) GetDate() int64 { if x != nil { return x.Date } - return "" + return 0 } func (x *AnnualReport) GetFileUrl() string { @@ -335,7 +335,7 @@ type AddAnnualReportReq struct { unknownFields protoimpl.UnknownFields FileName string `protobuf:"bytes,1,opt,name=fileName,proto3" json:"fileName"` //文件名称 - Date string `protobuf:"bytes,2,opt,name=date,proto3" json:"date"` //日期 + Date int64 `protobuf:"varint,2,opt,name=date,proto3" json:"date"` //日期 FileUrl string `protobuf:"bytes,3,opt,name=fileUrl,proto3" json:"fileUrl"` //访问地址 Operator string `protobuf:"bytes,4,opt,name=operator,proto3" json:"operator"` //操作人 OperatorId int32 `protobuf:"varint,5,opt,name=operatorId,proto3" json:"operatorId"` //操作人Id @@ -380,11 +380,11 @@ func (x *AddAnnualReportReq) GetFileName() string { return "" } -func (x *AddAnnualReportReq) GetDate() string { +func (x *AddAnnualReportReq) GetDate() int64 { if x != nil { return x.Date } - return "" + return 0 } func (x *AddAnnualReportReq) GetFileUrl() string { @@ -462,7 +462,7 @@ type EditAnnualReportReq struct { Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //id FileName string `protobuf:"bytes,2,opt,name=fileName,proto3" json:"fileName"` //文件名称 - Date string `protobuf:"bytes,3,opt,name=date,proto3" json:"date"` //日期 + Date int64 `protobuf:"varint,3,opt,name=date,proto3" json:"date"` //日期 FileUrl string `protobuf:"bytes,4,opt,name=fileUrl,proto3" json:"fileUrl"` //访问地址 Sort int32 `protobuf:"varint,5,opt,name=sort,proto3" json:"sort"` //排序 Status int32 `protobuf:"varint,6,opt,name=status,proto3" json:"status"` //状态(1:上架,2:下架) @@ -516,11 +516,11 @@ func (x *EditAnnualReportReq) GetFileName() string { return "" } -func (x *EditAnnualReportReq) GetDate() string { +func (x *EditAnnualReportReq) GetDate() int64 { if x != nil { return x.Date } - return "" + return 0 } func (x *EditAnnualReportReq) GetFileUrl() string { @@ -1362,7 +1362,7 @@ var file_api_reports_reports_proto_rawDesc = []byte{ 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, @@ -1376,7 +1376,7 @@ var file_api_reports_reports_proto_rawDesc = []byte{ 0x0a, 0x12, 0x41, 0x64, 0x64, 0x41, 0x6e, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, - 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, @@ -1390,7 +1390,7 @@ var file_api_reports_reports_proto_rawDesc = []byte{ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x66, + 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, diff --git a/api/reports/reports.proto b/api/reports/reports.proto index e3220a5..adbaff3 100644 --- a/api/reports/reports.proto +++ b/api/reports/reports.proto @@ -40,7 +40,7 @@ message GetAnnualReportListResp{ message AnnualReport{ int32 id = 1; //id string fileName = 2; //文件名称 - string date = 3; //日期 + int64 date = 3; //日期 string fileUrl = 4; //访问地址 int32 status = 5; //状态(1:上架,2:下架) int32 sort = 6; //排序 @@ -51,7 +51,7 @@ message AnnualReport{ message AddAnnualReportReq{ string fileName = 1; //文件名称 - string date = 2; //日期 + int64 date = 2; //日期 string fileUrl = 3; //访问地址 string operator = 4; //操作人 int32 operatorId = 5; //操作人Id @@ -64,7 +64,7 @@ message AddAnnualReportResp{ message EditAnnualReportReq{ int32 id = 1; //id string fileName = 2; //文件名称 - string date = 3; //日期 + int64 date = 3; //日期 string fileUrl = 4; //访问地址 int32 sort = 5; //排序 int32 status = 6; //状态(1:上架,2:下架) diff --git a/internel/model/reports.go b/internel/model/reports.go index dfab06f..e2825e1 100644 --- a/internel/model/reports.go +++ b/internel/model/reports.go @@ -12,7 +12,7 @@ type AnnualReport struct { UpdatedAt time.Time DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;index:idx_annual_report_deleted_at;"` FileName string `gorm:"column:file_name;type:varchar(100);not null;default:'';comment:文件名称"` - Date string `gorm:"column:date;type:varchar(100);not null;default:'';comment:日期"` + Date int64 `gorm:"column:date;type:int;not null;default:0;comment:日期"` FileUrl string `gorm:"column:file_url;type:varchar(100);not null;default:'';comment:访问地址"` Status int32 `gorm:"column:status;type:int;not null;default:2;comment:状态:1上架 2 下架"` Sort int32 `gorm:"column:sort;type:int;not null;default:1;comment:排序"`