From 8a3ab76a6335f120e49e375e4a44023db9adfd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Sat, 20 Sep 2025 19:59:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_property/models/property_meter_archives.py | 2 ++ yuthon_property/models/property_meter_water.py | 1 + 2 files changed, 3 insertions(+) diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py index 9a0030a81..b82793944 100644 --- a/yuthon_property/models/property_meter_archives.py +++ b/yuthon_property/models/property_meter_archives.py @@ -226,8 +226,10 @@ class MeterArchivesLine(models.Model): idx = lines.ids.index(line.id) if idx > 0: prev_line = lines[idx - 1] + line.last_read = prev_line.current_read line.last_dosage = (prev_line.current_read or 0) - (prev_line.last_read or 0) else: + line.last_read = 0.0 line.last_dosage = 0.0 else: # 当前记录没有抄表日期,无法计算上次用量 diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py index 18546e1bc..697dff3b4 100644 --- a/yuthon_property/models/property_meter_water.py +++ b/yuthon_property/models/property_meter_water.py @@ -204,6 +204,7 @@ class MeterWaterLine(models.Model): idx = lines.ids.index(line.id) if idx > 0: prev_line = lines[idx - 1] + line.last_read = prev_line.current_read line.last_dosage = (prev_line.current_read or 0) - (prev_line.last_read or 0) else: line.last_dosage = 0.0