From f83dcf20f33d6d9ee65faf05f171f9786a3bb813 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 5 Jun 2025 11:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=BE=8E=E5=85=89=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E6=BC=8F=E7=AD=BE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E7=8F=AD=E6=89=93=E5=8D=A1=E6=BC=8F?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/xmgsecond/entity/KqFormatTotal.java | 8 ++++++++ src/com/engine/xmgsecond/util/KqCalulateUtil.java | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/engine/xmgsecond/entity/KqFormatTotal.java b/src/com/engine/xmgsecond/entity/KqFormatTotal.java index 3c896b3..e70c0d0 100644 --- a/src/com/engine/xmgsecond/entity/KqFormatTotal.java +++ b/src/com/engine/xmgsecond/entity/KqFormatTotal.java @@ -21,8 +21,16 @@ public class KqFormatTotal { private Integer absenteeism; + /** + * 下班漏签 + */ private Integer forgotCheck; + /** + * 上班漏签 + */ + private Integer forgotbeginworkcheck; + private Integer beLateMins; private Integer gravebeLateMins; diff --git a/src/com/engine/xmgsecond/util/KqCalulateUtil.java b/src/com/engine/xmgsecond/util/KqCalulateUtil.java index c98474b..9fb1d5f 100644 --- a/src/com/engine/xmgsecond/util/KqCalulateUtil.java +++ b/src/com/engine/xmgsecond/util/KqCalulateUtil.java @@ -28,12 +28,13 @@ public class KqCalulateUtil { public static List abnormalAttendance(String resourceId,String fromDate,String toDate) { RecordSet rs = new RecordSet(); List kqFormatTotalList = new ArrayList<>(); - rs.executeQuery("select resourceid, forgotCheck, absenteeism, beLateMins, gravebeLateMins, leaveEearly, " + + rs.executeQuery("select resourceid, forgotCheck,forgotbeginworkcheck, absenteeism, beLateMins, gravebeLateMins, leaveEearly, " + " graveLeaveEarly from kq_format_total where resourceid = ? and kqdate >= '"+fromDate+"' and kqdate <= '"+toDate+"'",resourceId); while (rs.next()) { boolean isAbsence; int absenteeism = Util.getIntValue(rs.getString("absenteeism")); int forgotCheck = Util.getIntValue(rs.getString("forgotCheck")); + int forgotbeginworkcheck = Util.getIntValue(rs.getString("forgotbeginworkcheck")); int beLateMins = Util.getIntValue(rs.getString("beLateMins"),0); int gravebeLateMins = Util.getIntValue(rs.getString("gravebeLateMins"),0); int leaveEearly = Util.getIntValue(rs.getString("leaveEearly")); @@ -42,6 +43,7 @@ public class KqCalulateUtil { //规则1 isAbsence = isPositive(absenteeism) || isPositive(forgotCheck) || + isPositive(forgotbeginworkcheck) || sumPositive(leaveEearly, graveLeaveEarly) > 0; kqFormatTotalList.add(KqFormatTotal.builder()