From 2db149add482b40da960e1835baeebc20340ba12 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Mon, 9 Dec 2024 19:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/att/AttSourceDataMapper.xml   |  1 +
 .../main/resources/mapper/att/WechatPushMapper.xml | 14 ++++++++------
 .../main/resources/mapper/basic/SysUserMapper.xml  |  4 +++-
 3 files changed, 12 insertions(+), 7 deletions(-)

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 c974cbc..1faa42f 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
@@ -121,6 +121,7 @@
         <if test=' pushType == "2" '>
 			= #{pushDate}
         </if>
+        and is_wechat != 1
     </select>
 
     <select id="getAllPerson" resultType="com.bonus.system.att.entity.AttDataBean">
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml
index bfdb422..7f65857 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/WechatPushMapper.xml
@@ -33,7 +33,7 @@
 
     <insert id="pushAttDataToQsy">
         <foreach collection="list" item="item" separator=";">
-            INSERT INTO gz_cloud_test.fc_sup_attendance (
+            replace INTO gz_cloud_test.fc_sup_attendance (
             name,
             id_number,
             org_id,
@@ -44,7 +44,8 @@
             lon,
             lat,
             attendance_external,
-            attendance_remark
+            attendance_remark,
+            is_wechat
             ) VALUES (
             #{item.name},
             #{item.idNumber},
@@ -60,17 +61,18 @@
             #{item.attLon},
             #{item.attLat},
             CASE
-            WHEN #{item.isOutsideAtt} = '1' THEN '外勤'
-            WHEN #{item.isOutsideAtt} = '2' THEN '注册'
+            WHEN #{item.isOutsideAtt} = '1' THEN '外勤打卡'
+            WHEN #{item.isOutsideAtt} = '2' THEN '正常打卡'
             ELSE '默认'
             END,
-            #{item.remark}
+            #{item.remark},
+            '1'
             )
         </foreach>
     </insert>
 
     <update id="updateWebPassword">
-        update sys_user set password = #{password} where user_id = #{userId}
+        update sys_user set password = #{password},update_time = #{updateTime} where user_id = #{userId}
     </update>
     <update id="updateWebOpenId">
         update sys_user set open_id = #{openId} where user_id = #{userId}
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml
index ebd5719..85b7e35 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml
@@ -73,13 +73,15 @@
 		update sys_user set is_face = #{isFace} where user_id = #{userId}
 	</update>
 
+<!--	改两次sys_user是为了第一次录入人脸时多次录入需要审核但又未更新时间的问题-->
 	<update id="checkPersonAssignment">
 		UPDATE sys_user_face SET
 			 `is_check` = #{isCheck},
 			 `examine_opinion` = #{examineOpinion}
 		 WHERE `user_id` = #{userId};
 		<if test='isCheck == 1'>
-			update sys_user set is_face = 0 where user_id = #{userId}
+			update sys_user set is_face = 1 where user_id = #{userId};
+			update sys_user set is_face = 0 where user_id = #{userId};
 		</if>
 	</update>