From 169c30f39554f26bd016645997062897741e1199 Mon Sep 17 00:00:00 2001 From: aikai Date: Sat, 23 Nov 2024 10:04:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=91=A8=E6=9C=AB=E6=89=93?= =?UTF-8?q?=E5=8D=A1=E6=89=93=E5=8D=A1=E7=8A=B6=E6=80=81=E8=AE=A1=E7=AE=97?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/attendance/vo/AttendancePunchPageVO.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/vo/AttendancePunchPageVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/vo/AttendancePunchPageVO.java index 2e6113d8..15676f9e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/vo/AttendancePunchPageVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/vo/AttendancePunchPageVO.java @@ -77,13 +77,14 @@ public class AttendancePunchPageVO { /** * 处理加班打卡 不计算是否迟到早退 + * * @param punchType */ public void setPunchType(Integer punchType) { - if (this.getFieldworkFlag() == 0) { + if (this.getWorkOvertimeFlag() == 0) { this.punchType = punchType; } else { - this.punchType = Arrays.asList(0, 2).contains(punchType) ? 0 : 1; + this.punchType = Arrays.asList(0, 2).contains(punchType) ? 0 : (Arrays.asList(1, 3).contains(punchType) ? 1 : 4); } } }