From 9edf29cc29dfe7c106c0fc6d8a569881a46fc570 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Mon, 6 Jan 2025 18:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=98=8E=E7=BB=86=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/system/att/tasks/AttTasks.java  | 28 +++++++++----------
 .../mapper/att/AttSourceDataMapper.xml        |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
index 494b38c..e480fc0 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
@@ -139,7 +139,7 @@ public class AttTasks {
      */
     private void pushAttData(String pushDate, int pushType) {
         //获取黔送云的考勤数据
-//        getQsyAttendanceData(pushDate, pushType);
+        getQsyAttendanceData(pushDate, pushType);
         //获取考勤机中的考勤数据
         getMachineAttendanceData(pushDate, pushType);
 //        //查出每一个考勤组的应出勤天数以及考勤组的规则
@@ -660,19 +660,19 @@ public class AttTasks {
 //                    System.out.println("c.getAttCurrentTime() = ");
 //                }
                 // 处理逻辑 出入异常的逻辑
-                try {
-                    Map<Boolean, List<AttSourceDataBean>> result = checkAdjacentAttType1WithGapAndCheckTypesBefore(v, attGroupBean.getEntryAbnormalMinute());
-                    if (result.containsKey(true)) {
-                        List<AttSourceDataBean> matchingItems = result.get(true);
-                        frontToWorkBean = matchingItems.get(0);
-                        frontToWorkBean.setAbnormalAttTime(matchingItems.get(1).getAttCurrentTime());
-                        frontToWorkBean.setAbnormalAttAddress(matchingItems.get(1).getAttAddress());
-                        frontToWorkBean.setAttStatus(8);
-                    }
-                }catch(Exception e){
-                    e.printStackTrace();
-                    log.error("出入异常处理报错");
-                }
+//                try {
+//                    Map<Boolean, List<AttSourceDataBean>> result = checkAdjacentAttType1WithGapAndCheckTypesBefore(v, attGroupBean.getEntryAbnormalMinute());
+//                    if (result.containsKey(true)) {
+//                        List<AttSourceDataBean> matchingItems = result.get(true);
+//                        frontToWorkBean = matchingItems.get(0);
+//                        frontToWorkBean.setAbnormalAttTime(matchingItems.get(1).getAttCurrentTime());
+//                        frontToWorkBean.setAbnormalAttAddress(matchingItems.get(1).getAttAddress());
+//                        frontToWorkBean.setAttStatus(8);
+//                    }
+//                }catch(Exception e){
+//                    e.printStackTrace();
+//                    log.error("出入异常处理报错");
+//                }
                 //没有下班卡则添加第一次打卡数据
                 newList.add(frontToWorkBean);
                 //获取工作异常
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml
index c1f3dfe..28db24a 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml
@@ -337,7 +337,7 @@
     </select>
 
     <select id="getLeaveData" resultType="com.bonus.system.att.entity.LeaveBean">
-        SELECT la.*,
+        SELECT agpr.org_id,la.*,
                sdd.dict_value AS attStatus
         FROM leave_apply la
                  LEFT JOIN sys_dict_data sdd ON sdd.dict_label = if(la.type is not null, la.type, la.leave_type)