From 4a484644c436d5c811da116d7d574204b072716e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Mon, 18 Aug 2025 17:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=BA=E8=84=B8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bmw/service/impl/PmWorkerServiceImpl.java      |  7 ++++---
 .../main/resources/mapper/bmw/PmWorkerMapper.xml   | 14 ++------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java
index 8451bdf..65b7e0b 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java
@@ -189,12 +189,13 @@ public class PmWorkerServiceImpl implements PmWorkerService{
                 remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER);
             }
         }
-        //更新入场记录最新记录标识 再入场，清除最新标识
-        mapper.updateEinRecordLast(record.getId());
-        //已经入过场了
+
         if(record.getEinStatus() == 1){
+            //已经入过场了
             addWorkerWageCardDataAndContract(record,fileMsg);
         }else {
+            //重新入场 再入场，清除最新标识
+            mapper.updateEinRecordLast(record.getId());
             //换工程没换人脸
             remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER);
             addWorkerEinData(record,fileMsg);
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml
index b8f5533..e80680a 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml
@@ -14,7 +14,6 @@
     <result column="start_time" property="startTime" />
     <result column="end_time" property="endTime" />
     <result column="address" property="address" />
-    <result column="face_photo" property="facePhoto" />
     <result column="ein_status" property="einStatus" />
     <result column="light_status" property="lightStatus" />
     <result column="create_user" property="createUser" />
@@ -29,11 +28,6 @@
     <result column="post_id" property="postId" />
     <result column="sub_id" property="subId" />
   </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, `name`, id_number, sex, age, phone, birthday, nation, issuing_authority, start_time, 
-    end_time, address, face_photo, ein_status, light_status, create_user, update_user
-  </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     SELECT
     pw.id,
@@ -47,7 +41,6 @@
     pw.start_time,
     pw.end_time,
     pw.address,
-    pw.face_photo,
     bmew.pro_id,
     bmew.team_id,
     bmew.post_id,
@@ -69,9 +62,9 @@
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.bmw.domain.vo.PmWorker" useGeneratedKeys="true">
     <!--@mbg.generated-->
     insert into pm_worker (`name`, id_number, sex, age, phone, birthday, nation, issuing_authority, 
-      start_time, end_time, address, face_photo, create_user)
+      start_time, end_time, address, create_user)
     values (#{name}, #{idNumber}, #{sex}, #{age}, #{phone}, #{birthday}, #{nation}, #{issuingAuthority}, 
-      #{startTime}, #{endTime}, #{address}, #{facePhoto}, #{createUser})
+      #{startTime}, #{endTime}, #{address}, #{createUser})
   </insert>
 
   <select id="selectWorkList" resultMap="BaseResultMap">
@@ -195,9 +188,6 @@
       <if test="address != null and address != ''">
         address = #{address},
       </if>
-      <if test="facePhoto != null and facePhoto != ''">
-          face_photo = #{facePhoto},
-      </if>
       <if test="updateUser != null and updateUser != ''">
         update_user = #{updateUser},
       </if>