From da31327d5504e01f1cc3d1fda2183f8ecd6b9b1d Mon Sep 17 00:00:00 2001 From: han0 Date: Fri, 11 Apr 2025 08:22:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=8F=E5=BB=BA?= =?UTF-8?q?=E5=8E=85=E8=AE=A1=E7=AE=97=E4=BB=B7=E6=A0=BC=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/commons/models/data_fujian.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/commons/models/data_fujian.py b/web/commons/models/data_fujian.py index 077e517..5c9e818 100644 --- a/web/commons/models/data_fujian.py +++ b/web/commons/models/data_fujian.py @@ -1,3 +1,6 @@ +import datetime + +from dateutil.relativedelta import relativedelta from sqlalchemy import Column, Integer, String, Numeric, Date, UniqueConstraint from commons.models.mixin.base import BaseModelMixin @@ -43,8 +46,10 @@ class DataFujian(db.Model, Model, BaseModelMixin): def get_query(cls, year=None, month=None, name=None, spec=None, name_in=None, region='福州', number=None): query = cls.query if year and month: - query = query.filter(cls.year == year) - query = query.filter(cls.month == month) + start_date = datetime.date(year, month, 1) + end_date = start_date + relativedelta(months=1) + query = query.filter(cls.date >= start_date) + query = query.filter(cls.date < end_date) if number: query = query.filter(cls.number == number) if name: