From 9ba0521200bbb63b6bbe6b3d4479bc0b0a85c53b Mon Sep 17 00:00:00 2001 From: sunwen Date: Wed, 20 Nov 2024 16:11:30 +0800 Subject: [PATCH] fix: Search date of filter show the wrong date text. --- src/forms/recon/ScanSearchCriteriaForm.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/forms/recon/ScanSearchCriteriaForm.cpp b/src/forms/recon/ScanSearchCriteriaForm.cpp index c96bd12..7c1d453 100644 --- a/src/forms/recon/ScanSearchCriteriaForm.cpp +++ b/src/forms/recon/ScanSearchCriteriaForm.cpp @@ -71,7 +71,7 @@ ScanSearchCriteriaForm::ScanSearchCriteriaForm(QWidget *parent) connect(ui->mLBBeginDate, &QToolButton::clicked, [=]() { - DialogResult result = DialogManager::Default()->requestSelectDate(ui->mLBEndDate->text()); + DialogResult result = DialogManager::Default()->requestSelectDate(ui->mLBBeginDate->text()); if (result.ResultCode == QDialog::Accepted) { ui->mLBBeginDate->setText(result.ResultData.toString()); @@ -103,9 +103,11 @@ ScanSearchCriteriaForm::ScanSearchCriteriaForm(QWidget *parent) connect(ui->mBtnAll, &QToolButton::clicked, [=]() { - QString today = QDate::currentDate().toString("yyyy-MM-dd"); - ui->mLBEndDate->setText(today); - ui->mLBBeginDate->setText("1990-01-01"); + QDate today = QDate::currentDate(); + ui->mLBEndDate->setText(today.toString("yyyy-MM-dd")); + int expireDays = JsonObject::Instance()->getScanListExpireDays(); + QDate beginDate = today.addDays(-expireDays); + ui->mLBBeginDate->setText(beginDate.toString("yyyy-MM-dd")); updateSearchFilter(); });