From 33cc335017ca678220f23da5f8614dd717544e30 Mon Sep 17 00:00:00 2001 From: han0 Date: Thu, 13 Feb 2025 14:59:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B6=8B=E5=8A=BF?= =?UTF-8?q?=E8=A1=A8=E4=B8=89=E6=98=8E=E9=92=A2=E9=93=81=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E6=9C=AA=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/calculators/__init__.py | 2 +- web/commons/models/sanming_steel.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/calculators/__init__.py b/web/calculators/__init__.py index 6aff7c0..6c74197 100644 --- a/web/calculators/__init__.py +++ b/web/calculators/__init__.py @@ -150,7 +150,7 @@ class Calculator: return price, fluctuating def _get_ss_price(self): - query = SanmingSteel.get_query(self.year, self.month, name='高线', spec='φ10mm') + query = SanmingSteel.get_query(self.year, self.month, material=self.material_id) data = query.first() price = int(data.price) if data else 0 fluctuating = int(self._get_fluctuating('price_ss', price)) diff --git a/web/commons/models/sanming_steel.py b/web/commons/models/sanming_steel.py index 0593579..d09fffc 100644 --- a/web/commons/models/sanming_steel.py +++ b/web/commons/models/sanming_steel.py @@ -32,7 +32,7 @@ class SanmingSteel(db.Model, Model, BaseModelMixin): return result @classmethod - def get_query(cls, year, month, name, spec): + def get_query(cls, year, month, name=None, spec=None, material=None): start_date = datetime.date(year, month, 1) end_date = start_date + relativedelta(months=1) query = cls.query @@ -42,4 +42,6 @@ class SanmingSteel(db.Model, Model, BaseModelMixin): query = query.filter(cls.name == name) if spec: query = query.filter(cls.spec == spec) + if material: + query = query.filter(cls.material == material) return query