root/material-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复趋势表三明钢铁价格未正常显示的问题

Browse Source
This commit is contained in:
han0
2025-02-13 14:59:34 +08:00
parent 66ce227835
commit 33cc335017
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/calculators/__init__.py
View File

@@ -150,7 +150,7 @@ class Calculator:
return price, fluctuating return price, fluctuating
def _get_ss_price(self): 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() data = query.first()
price = int(data.price) if data else 0 price = int(data.price) if data else 0
fluctuating = int(self._get_fluctuating('price_ss', price)) fluctuating = int(self._get_fluctuating('price_ss', price))

4
web/commons/models/sanming_steel.py
View File

@@ -32,7 +32,7 @@ class SanmingSteel(db.Model, Model, BaseModelMixin):
return result return result
@classmethod @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) start_date = datetime.date(year, month, 1)
end_date = start_date + relativedelta(months=1) end_date = start_date + relativedelta(months=1)
query = cls.query query = cls.query
@@ -42,4 +42,6 @@ class SanmingSteel(db.Model, Model, BaseModelMixin):
query = query.filter(cls.name == name) query = query.filter(cls.name == name)
if spec: if spec:
query = query.filter(cls.spec == spec) query = query.filter(cls.spec == spec)
if material:
query = query.filter(cls.material == material)
return query return query