From ffb62aac389a6ac596fe8d0d44d4e242beeea0f2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 10 Mar 2022 11:46:31 +0800
Subject: [PATCH] 考勤查询接口修改，电子围栏自定义新增、修改，查询一个点是否在电子围栏内接口新增

---
 src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml b/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml
index 7b08a66..8f26f9d 100644
--- a/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml
+++ b/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml
@@ -39,6 +39,9 @@
         <if test="attendance.clockType!=null">
             and sa.clock_type = #{attendance.clockType}
         </if>
+        <if test="attendance.legwork!=null">
+            and sa.legwork = #{attendance.legwork}
+        </if>
         <if test="attendance.beginTime!=null and attendance.beginTime!=''">
             and date_format(sa.clock_time,'%Y-%m-%d')&gt;=#{attendance.beginTime}
         </if>
@@ -57,7 +60,6 @@
         case when sa.attendance_type=1 then '正常'
         when sa.attendance_type=2 then '迟到'
         when sa.attendance_type=3 then '早退'
-        when sa.attendance_type=4 then '外勤'
         else '无效打卡' end as attendanceType
          from sys_attendance sa
         left join blade_user bu on bu.id = sa.user_id
@@ -94,8 +96,6 @@
         number = #{number}
             and
         to_days(now())=to_days(clock_time)
-            and
-        is_deleted=0
     </select>
 
     <!--查询当前时间之前最新的一条数据-->

--
Gitblit v1.9.3