feat: 算总煤耗时month_s以day_s相加
This commit is contained in:
parent
617013f299
commit
cdfa35851d
|
|
@ -536,9 +536,9 @@ def cal_enstat(type, sflogId, mgroupId, year, month, day, hour, year_s, month_s,
|
||||||
sum=Sum("pcoal_coal_consume")
|
sum=Sum("pcoal_coal_consume")
|
||||||
)["sum"]
|
)["sum"]
|
||||||
elif type == "month_s":
|
elif type == "month_s":
|
||||||
enstat.pcoal_coal_consume = EnStat.objects.filter(type="sflog", mgroup=enstat.mgroup, year_s=year_s, month_s=month_s).aggregate(sum=Sum("pcoal_coal_consume"))["sum"]
|
enstat.pcoal_coal_consume = EnStat.objects.filter(type="day_s", mgroup=enstat.mgroup, year_s=year_s, month_s=month_s).aggregate(sum=Sum("pcoal_coal_consume"))["sum"]
|
||||||
elif type == "year_s":
|
elif type == "year_s":
|
||||||
enstat.pcoal_coal_consume = EnStat.objects.filter(type="sflog", mgroup=enstat.mgroup, year_s=year_s).aggregate(sum=Sum("pcoal_coal_consume"))["sum"]
|
enstat.pcoal_coal_consume = EnStat.objects.filter(type="month_s", mgroup=enstat.mgroup, year_s=year_s).aggregate(sum=Sum("pcoal_coal_consume"))["sum"]
|
||||||
|
|
||||||
if enstat.pcoal_coal_consume is None:
|
if enstat.pcoal_coal_consume is None:
|
||||||
enstat.pcoal_coal_consume = 0
|
enstat.pcoal_coal_consume = 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue