feat: 新增住建厅价格计算

web/commons/models/data_fujian.py

@@ -38,3 +38,19 @@ class DataFujian(db.Model,  Model, BaseModelMixin):
         query = query.filter(DataFujian.spec == self.spec)
         result = query.one_or_none()
         return result
+
+    @classmethod
+    def get_query(cls, year=None, month=None, name=None, spec=None, name_in=None, region='福州'):
+        query = cls.query
+        if year and month:
+            query = query.filter(cls.year == year)
+            query = query.filter(cls.month == month)
+        if name:
+            query = query.filter(cls.name == name)
+        if name_in:
+            query = query.filter(cls.name.in_(name_in))
+        if spec:
+            query = query.filter(cls.spec.like(f'%{spec}%'))
+        if region:
+            query = query.filter(cls.city.like(f'%{region}%'))
+        return query

web/commons/models/price_publish.py

@@ -51,6 +51,7 @@ class PricePublish(db.Model, Model, OperationTrackMixin, BaseModelMixin):
         query = query.filter(cls.year == self.year)
         query = query.filter(cls.month == self.month)
         query = query.filter(cls.name == self.name)
+        query = query.filter(cls.spec == self.spec)
         query = query.filter(cls.type == self.type)
         result = query.one_or_none()
         return result

web/commons/models/price_result.py

@@ -27,6 +27,8 @@ class PriceResult(db.Model, Model, OperationTrackMixin, BaseModelMixin):
     price_calculate = Column('PRICE_CALCULATE', Numeric(16, 4), default=0, comment='计算价格')
     price_recommend = Column('PRICE_RECOMMEND', Numeric(16, 4), default=0, comment='推荐价格')
     fluctuating_recommend = Column('FLUCTUATING_RECOMMEND', Numeric(16, 4), default=0, comment='推荐浮动')
+    price_fujian = Column('PRICE_FUJIAN', Numeric(16, 4), default=0, comment='住建厅价格')
+    fluctuating_fujian = Column('FLUCTUATING_FUJIAN', Numeric(16, 4), default=0, comment='住建厅浮动')
     spec = Column('SPEC', String(128), default='', comment='规格')
     unit = Column('UNIT', String(128), default='', comment='单位')