From 36ab8ceab307ed257ed66044b328473b351d6a34 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: Thu, 5 Feb 2026 14:56:26 +0800 Subject: [PATCH 1/2] =?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_hr_attendance/models/yuthon_holiday_statement.py | 2 +- yuthon_hr_attendance/views/yuthon_holiday_statement.xml | 2 +- yuthon_issue/views/issue_approval_decision_views.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/models/yuthon_holiday_statement.py b/yuthon_hr_attendance/models/yuthon_holiday_statement.py index 205bc6342..492accd77 100644 --- a/yuthon_hr_attendance/models/yuthon_holiday_statement.py +++ b/yuthon_hr_attendance/models/yuthon_holiday_statement.py @@ -67,6 +67,6 @@ class InheritHrLeave(models.Model): ('date_from', '<=', end_of_year), ('state', '=', 'validate'), ]) - total_days = sum(leave.number_of_days for leave in leave_records) + total_days = sum(leave.length_leave for leave in leave_records) leave_type_name = record.holiday_status_id.name record.leave_stats = f"本年内已请{leave_type_name}{total_days:.1f}天" \ No newline at end of file diff --git a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml index d6d09fc15..872b21d18 100644 --- a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml +++ b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml @@ -12,7 +12,7 @@ - + diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml index c5680f3d2..d6b7a264d 100644 --- a/yuthon_issue/views/issue_approval_decision_views.xml +++ b/yuthon_issue/views/issue_approval_decision_views.xml @@ -80,6 +80,7 @@ issue.approval.decision + From bedeb5fa5d6816059eaf624e37f4e2d2ef9303d2 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: Thu, 5 Feb 2026 14:59:39 +0800 Subject: [PATCH 2/2] =?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_issue/views/issue_approval_decision_views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml index d6b7a264d..81c402e0b 100644 --- a/yuthon_issue/views/issue_approval_decision_views.xml +++ b/yuthon_issue/views/issue_approval_decision_views.xml @@ -80,7 +80,7 @@ issue.approval.decision - +