Merge pull request !12374 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-07-08 09:00:44 +00:00
committed by Gitee
+3 -3
View File
@@ -291,14 +291,14 @@ class YuthonDashboard(models.Model):
return {'rent_arrears': [], 'monthly_precollection': [], 'expense': []}
try:
# 前期欠收:调用 get_pre_arrears_report,从 rows 取物业名和金额
# 累计欠收:调用 get_cum_arrears_report,从 rows 取物业名和未收金额
rent_arrears = []
arrears_result = self.env['receivable.modify.line'].get_pre_arrears_report(base_params)
arrears_result = self.env['receivable.modify.line'].get_cum_arrears_report(base_params)
for idx, row in enumerate(arrears_result.get('rows', []), start=1):
# 物业名称可能是对象 {display_name} 或字符串
prop = row.get('物业名称', '')
prop_name = prop.get('display_name', '') if isinstance(prop, dict) else str(prop)
amount = row.get('金额', 0)
amount = row.get('未收金额', 0) # 累计欠收报表的字段名为"未收金额"
payout = row.get('收款日期', '')
# 有收款日期的标注
suffix = f"({payout}已交)" if payout else ''