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: