From 9c7a500916a376d75f9e2d89e7113a491755d6ec Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Tue, 26 Mar 2024 02:05:09 +0800
Subject: [PATCH] update code

---
 .../SurProjectAttendanceDataServiceImpl.java     |  3 ---
 .../project/SurProjectAttendanceUserMapper.xml   | 16 ++++++++--------
 2 files changed, 8 insertions(+), 11 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 c3744c98..5aad8f37 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
@@ -237,9 +237,6 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
             sdata.setId(list.get(0).getId());
             SurProjectAttendanceData upData=list.get(0);
             upData.setAttendanceOutTime(sdata.getAttendanceTime());
-            upData.setGroupName(sdata.getGroupName());
-            upData.setCompanyName(sdata.getCompanyName());;
-            upData.setWorkTypeName(sdata.getWorkTypeName());
             updateSurProjectAttendanceData(upData);
         }
     }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
index 8a339169..ea2ccbdb 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
@@ -58,14 +58,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sur_project_attendance_user
     </sql>
     <select id="selectSurProjectAttendanceUserListJgw" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
-        select u.id,u.cfgid,u.app_id,u.vendors_code,u.workerId,u.laborWorkerId,u.workerCategory,u.qrCode,u.name,
-               u.ethnic,u.nativePlace,u.gender,u.birthDate,u.phone,u.degreeName,u.photo,u.recentPhoto,
-               u.groupId,u.groupName,u.leader,u.workTypeCode,u.specWorkType,
-               u.hatCode,u.state,u.enterDate,u.exitDate,u.companyId,u.vendorId,
-               u.teamId,u.teamName,u.enterType,u.remark,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
-               c.project_id,c.sub_dept_id,g.companyName,g.companyCode workTypeName
-        from sur_project_attendance_user u,sur_project_attendance_cfg c,sur_project_attendance_group g
-        where u.cfgid=c.id and g.companyid=u.companyid and u.vendors_code='jgw'
+        SELECT u.id,u.cfgid,u.app_id,u.vendors_code,u.workerId,u.laborWorkerId,u.workerCategory,u.qrCode,u.name,
+        u.ethnic,u.nativePlace,u.gender,u.birthDate,u.phone,u.degreeName,u.photo,u.recentPhoto,
+        u.groupId,u.leader,u.workTypeCode,u.specWorkType,
+        u.hatCode,u.state,u.enterDate,u.exitDate,u.companyId,u.vendorId,
+        u.teamId,u.teamName,u.enterType,u.remark,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
+        c.project_id,c.sub_dept_id,u.companyName,u.workTypeName,g.teamname groupName
+        FROM sur_project_attendance_user u,sur_project_attendance_cfg c,sur_project_attendance_group g
+        WHERE u.cfgid=c.id AND g.companyid=u.companyid AND u.vendors_code='jgw'
             <if test="cfgid != null "> and cfgid = #{cfgid}</if>
             <if test="appId != null "> and app_id = #{appId}</if>
             <if test="vendorsCode != null  and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if>