feat: 计算逻辑更新

web/commons/models/data_network.py

@@ -41,7 +41,7 @@ class DataNetwork(db.Model,  Model, BaseModelMixin):
         return result
 
     @classmethod
-    def get_query(cls, year, month, name, spec=None, region="福州"):
+    def get_query(cls, year, month, name=None, spec=None, region="福州"):
         start_date = datetime.date(year, month, 1)
         end_date = start_date + relativedelta(months=1)
         query = cls.query

web/commons/models/fujian_survey.py

@@ -48,7 +48,7 @@ class FujianSurvey(db.Model, Model, BaseModelMixin):
         if name_in:
             query = query.filter(cls.name.in_(name_in))
         if spec:
-            query = query.filter(cls.spec == spec)
+            query = query.filter(cls.spec.like(f'%{spec}%'))
         if region:
             query = query.filter(cls.region.like(f'%{region}%'))
         return query

web/commons/models/fuzhou_transportation_bureau.py

@@ -35,7 +35,7 @@ class FuzhouTransportationBureau(db.Model, Model, BaseModelMixin):
         return result
 
     @classmethod
-    def get_query(cls, year, month, name, region='福州'):
+    def get_query(cls, year, month, name, spec=None, region='福州'):
         start_date = datetime.date(year, month, 1)
         end_date = start_date + relativedelta(months=1)
         query = cls.query
@@ -43,6 +43,8 @@ class FuzhouTransportationBureau(db.Model, Model, BaseModelMixin):
         query = query.filter(cls.date < end_date)
         if name:
             query = query.filter(cls.name == name)
+        if spec:
+            query = query.filter(cls.spec.like(f'%{spec}%'))
         if region:
             query = query.filter(cls.region.like(f'%{region}%'))
         return query