From 5fcf98cad46302ddd4b46a285ae25bddf2c86476 Mon Sep 17 00:00:00 2001 From: ljmwkx <1340053001@qq.com> Date: Sun, 29 Dec 2024 17:44:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E6=88=90=20float?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/hr_attendance_detail_wechat.py | 3 ++- yuthon_hr_attendance/models/planning_template_inherit.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py index be26a7ca0..8fb4ce412 100644 --- a/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py +++ b/yuthon_hr_attendance/models/hr_attendance_detail_wechat.py @@ -865,7 +865,8 @@ class HrAttendanceDetail(models.Model): :return: 转换后的时间 """ - from_times = str(current_data) + " " + data + from_time = "%d:%d" % (int(data), round((data - int(data)) * 60)) + from_times = str(current_data) + " " + from_time from_ti = datetime.strptime(from_times, "%Y-%m-%d %H:%M") return from_ti diff --git a/yuthon_hr_attendance/models/planning_template_inherit.py b/yuthon_hr_attendance/models/planning_template_inherit.py index 9633d7db5..34825f264 100644 --- a/yuthon_hr_attendance/models/planning_template_inherit.py +++ b/yuthon_hr_attendance/models/planning_template_inherit.py @@ -21,11 +21,11 @@ class PlanningSlotTemplate(models.Model): day2 = fields.Char(string="次日") end_time2 = fields.Float(string="显示时间") - check_in_start = fields.Char(string="上班开始") - check_in_end = fields.Char(string="上班结束") + check_in_start = fields.Float(string="上班开始") + check_in_end = fields.Float(string="上班结束") - check_out_start = fields.Char(string="下班开始") - check_out_end = fields.Char(string="下班结束") + check_out_start = fields.Float(string="下班开始") + check_out_end = fields.Float(string="下班结束") def _compute_name(self): super()._compute_name()