feat: 变更计算方式
This commit is contained in:
@@ -36,7 +36,7 @@ class FujianSurvey(db.Model, Model, BaseModelMixin):
|
||||
return result
|
||||
|
||||
@classmethod
|
||||
def get_query(cls, year=None, month=None, name=None, spec=None, name_in=None, region='福州'):
|
||||
def get_query(cls, year=None, month=None, name=None, spec=None, name_in=None, region='福州', material_id=None):
|
||||
query = cls.query
|
||||
if year and month:
|
||||
start_date = datetime.date(year, month, 1)
|
||||
@@ -45,6 +45,8 @@ class FujianSurvey(db.Model, Model, BaseModelMixin):
|
||||
query = query.filter(cls.date < end_date)
|
||||
if name:
|
||||
query = query.filter(cls.name == name)
|
||||
if material_id:
|
||||
query = query.filter(cls.material_id == material_id)
|
||||
if name_in:
|
||||
query = query.filter(cls.name.in_(name_in))
|
||||
if spec:
|
||||
|
Reference in New Issue
Block a user