From 8ef7d7b80b4603d668e762e5f4af2c387bb6c5b2 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 25 Nov 2024 19:01:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E8=80=83=E5=8B=A4bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmgl/modules/worker/mapper/WorkerAttendanceMapper.java | 4 ++-- .../worker/service/impl/WorkerAttendanceServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java index 13213a5cf..8720e6163 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java @@ -138,7 +138,7 @@ public interface WorkerAttendanceMapper extends BaseMapper { * @param workerId * @return */ - String getWorkerAttendanceMinTime(@Param("workerId") Integer workerId); + String getWorkerAttendanceMinTime(@Param("workerId") String workerId); /** * 查询今日最晚通行的时间 @@ -146,7 +146,7 @@ public interface WorkerAttendanceMapper extends BaseMapper { * @param workerId * @return */ - String getWorkerAttendanceMaxTime(@Param("workerId") Integer workerId); + String getWorkerAttendanceMaxTime(@Param("workerId") String workerId); /** * 统计某日出勤人数统计 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java index 37fc6310b..d98ef3f80 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java @@ -495,8 +495,8 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl getPersonAttendanceTime(Map map) { Map data = new HashMap<>(16); - String enterTime = workerAttendanceMapper.getWorkerAttendanceMinTime(MapUtils.getInteger(map, "workerId")); - String outTime = workerAttendanceMapper.getWorkerAttendanceMaxTime(MapUtils.getInteger(map, "workerId")); + String enterTime = workerAttendanceMapper.getWorkerAttendanceMinTime(MapUtils.getString(map, "workerId")); + String outTime = workerAttendanceMapper.getWorkerAttendanceMaxTime(MapUtils.getString(map, "workerId")); data.put("enterTime", enterTime); data.put("outTime", outTime); return data; From b9fab2d18f11f7b4205efd51fcdde0ceaa4d708c Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 26 Nov 2024 09:48:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?app=E8=80=83=E5=8B=A4bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../worker/mapper/xml/WorkerAttendanceMapper.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml index bff932deb..426577e92 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml @@ -326,12 +326,12 @@