Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
This commit is contained in:
commit
3683ddbdeb
|
@ -134,7 +134,7 @@ def get_pcoal_heat(year_s: int, month_s: int, day_s: int):
|
||||||
mgroup__name='回转窑', shift__name__in=['白班', '早班']) # hardcode
|
mgroup__name='回转窑', shift__name__in=['白班', '早班']) # hardcode
|
||||||
if qs.pcoal_heat is None or qs.pcoal_heat <=0:
|
if qs.pcoal_heat is None or qs.pcoal_heat <=0:
|
||||||
s = SfLog.objects.filter(pcoal_heat__isnull=False).order_by('-start_time').first()
|
s = SfLog.objects.filter(pcoal_heat__isnull=False).order_by('-start_time').first()
|
||||||
if s:
|
if s and s.pcoal_heat:
|
||||||
qs.pcoal_heat = s.pcoal_heat
|
qs.pcoal_heat = s.pcoal_heat
|
||||||
else:
|
else:
|
||||||
qs.pcoal_heat = 25000
|
qs.pcoal_heat = 25000
|
||||||
|
|
Loading…
Reference in New Issue