!995 1

Merge pull request !995 from dev_ljm_20241129

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
 

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()