From 52d05d89a64a0dbff9fb939ce20e90566959f901 Mon Sep 17 00:00:00 2001 From: wolter Date: Thu, 28 Nov 2024 09:08:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B6=88=E6=81=AF=E6=B8=A0=E9=81=93fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/backend/corn_report_channel.go | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/http/entities/backend/corn_report_channel.go b/app/http/entities/backend/corn_report_channel.go index 31afe85..128d770 100644 --- a/app/http/entities/backend/corn_report_channel.go +++ b/app/http/entities/backend/corn_report_channel.go @@ -27,28 +27,29 @@ type ReportChannelList struct { UpdateTime []time.Time `json:"update_time" form:"update_time"` } -func (this *ReportChannelListRequest) Request2DB() (db ReportChannelList, err error) { - db.ReportChannelId = this.ReportChannelId - db.ClientKey = this.ClientKey - db.ClientSecret = this.ClientSecret - db.Status = this.Status - db.CreateTime = []time.Time{} +func (this *ReportChannelListRequest) Request2DB() (filter ReportChannelList, err error) { + filter.PageRequest = this.PageRequest + filter.ReportChannelId = this.ReportChannelId + filter.ClientKey = this.ClientKey + filter.ClientSecret = this.ClientSecret + filter.Status = this.Status + filter.CreateTime = []time.Time{} var t time.Time if len(this.CreateTime) == 2 { t, err = utils.StrToTimeShanghai(this.CreateTime[0]) - db.CreateTime = append(db.CreateTime, t) + filter.CreateTime = append(filter.CreateTime, t) t, err = utils.StrToTimeShanghai(this.CreateTime[1]) - db.CreateTime = append(db.CreateTime, t) + filter.CreateTime = append(filter.CreateTime, t) if err != nil { return } } - db.UpdateTime = []time.Time{} + filter.UpdateTime = []time.Time{} if len(this.UpdateTime) == 2 { t, err = utils.StrToTimeShanghai(this.UpdateTime[0]) - db.UpdateTime = append(db.UpdateTime, t) + filter.UpdateTime = append(filter.UpdateTime, t) t, err = utils.StrToTimeShanghai(this.UpdateTime[1]) - db.UpdateTime = append(db.UpdateTime, t) + filter.UpdateTime = append(filter.UpdateTime, t) if err != nil { return }