From 1693ba2efc15abc0b90023917751f1009f72fd66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sat, 23 Mar 2024 03:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SurProjectAttendanceDataServiceImpl.java   | 13 +++++--------
 .../project/SurProjectAttendanceUserMapper.xml      |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
index 453614ca..1d3a3bf7 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
@@ -1,9 +1,6 @@
 package com.yanzhu.jh.project.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.date.DateTime;
@@ -274,8 +271,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
             for (Map<String,Object> map:list) {
                 for(SurProjectAttendanceUser sau:datas){
                     if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){
-                        map.put("inTime",map.get("inTime"));
-                        map.put("outTime",map.get("outTime"));
+                        map.put("inTime",sau.getInTime());
+                        map.put("outTime",sau.getOutTime());
                         dataList.add(map);
                     }
                 }
@@ -295,8 +292,8 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
             for (Map<String,Object> map:list) {
                 for(SurProjectAttendanceUser sau:datas){
                     if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){
-                        map.put("inTime",map.get("inTime"));
-                        map.put("outTime",map.get("outTime"));
+                        map.put("inTime",sau.getInTime());
+                        map.put("outTime",sau.getOutTime());
                         dataList.add(map);
                     }
                 }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
index 6be4f2a6..cef24185 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
@@ -447,13 +447,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="todayAttendanceOtherData"  parameterType="map" resultMap="SurProjectAttendanceUserResult">
-        select workerid,attendance_type name,min(attendance_time) inTime,max(attendance_time) outTime from sur_project_attendance_data where cfgid=#{cfgid} and DATE(attendance_time)=#{date}
+        select workerid,min(attendance_time) inTime,max(attendance_time) outTime from sur_project_attendance_data where cfgid=#{cfgid} and DATE(attendance_time)=#{date}
         <if test="list !=null and list.size()>0">
             and workerid in
             <foreach collection="list"  item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
-        group by workerid,attendance_type
+        group by workerid
     </select>
 </mapper>
\ No newline at end of file