From 5fd01c5bb5bac10c032557b0614d24f94fa26c65 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 10 Sep 2025 10:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=B3=E5=8A=A1=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java    | 1 -
 .../zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java  | 2 ++
 .../xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml    | 7 +++++++
 .../modules/worker/service/impl/WorkerInfoServiceImpl.java | 4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
index 92c4c8f40..e917630e6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
@@ -443,7 +443,6 @@ public class WorkerInfo implements Serializable {
                 ", emergentPerson='" + emergentPerson + '\'' +
                 ", emergentPhone='" + emergentPhone + '\'' +
                 ", longTerm=" + longTerm +
-                ", inserviceType=" + inserviceType +
                 ", personType=" + personType +
                 ", teamId=" + teamId +
                 ", departmentId=" + departmentId +
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java
index f9a2f5470..ad3ed51ca 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java
@@ -70,6 +70,8 @@ public interface WorkerInfoMapper extends BaseMapper<WorkerInfo> {
      */
     WorkerInfo selectWorkWorkerInfoWithIdCard(@Param("idCard") String idCard, @Param("projectSn") String projectSn);
 
+    WorkerInfo selectWorkWorkerInfoWithIdCardAll(@Param("idCard") String idCard, @Param("projectSn") String projectSn);
+
     /**
      * 根据项目sn和出勤卡号查询人员信息
      *
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
index 24c0a674f..d1d17d439 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
@@ -305,6 +305,13 @@
         and inService_type = 1
         LIMIT 1
     </select>
+    <select id="selectWorkWorkerInfoWithIdCardAll" resultType="com.zhgd.xmgl.modules.worker.entity.WorkerInfo">
+        select *
+        from worker_info
+        where project_sn = #{projectSn}
+        and id_card = #{idCard}
+        LIMIT 1
+    </select>
     <select id="selectWorkWorkerInfoWithAttendanceNumber" resultType="com.zhgd.xmgl.modules.worker.entity.WorkerInfo">
         select *
         from worker_info
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 5a067a32b..67a553f36 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -2061,12 +2061,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
                     workerInfo.setPoliticsStatus(4);
                 }
                 workerInfo.setPayRollBankNumber(importInfo.get("银行卡号"));
-                workerInfo.setInserviceType(1);
                 workerInfo.setUfaceDevId(ufaceId);
                 boolean isVaild = IdCardUtils.strongVerifyIdNumber(workerInfo.getIdCard());
                 if (isVaild) {
                     hasSuc = true;
-                    WorkerInfo oldWorkerInfo = workerInfoMapper.selectWorkWorkerInfoWithIdCard(workerInfo.getIdCard(), workerInfo.getProjectSn());
+                    WorkerInfo oldWorkerInfo = workerInfoMapper.selectWorkWorkerInfoWithIdCardAll(workerInfo.getIdCard(), workerInfo.getProjectSn());
                     if (oldWorkerInfo != null) {
                         if (oldWorkerInfo.toExistString().equals(workerInfo.toExistString())) {
                             existName.append(workerInfo.getWorkerName());
@@ -2079,6 +2078,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
                         workerInfoService.editWorkerForUploadExcel(workerInfo);
                     } else {
                         String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
+                        workerInfo.setInserviceType(1);
                         workerInfo.setPersonSn(uuid);
                         workerInfo.setAddTime(new Date());
                         workerInfo.setAttendanceNumber(workerInfo.getIdCard());