From 2c6823552e03e03b61dccd50aec3366e67c2afbb Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 10 Sep 2025 10:24:21 +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 0fe6f4ea9..63cb72698 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
@@ -478,7 +478,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 7e0796df1..72f37ea92 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
@@ -72,6 +72,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 90fbef6b7..119107177 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
@@ -388,6 +388,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 e93c68e20..7ec41c836 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
@@ -2177,7 +2177,6 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
                 workerInfo.setPartyPosition(importInfo.get("党内职务"));
                 workerInfo.setPayRollBankNumber(importInfo.get("银行卡号"));
                 workerInfo.setBranchId(Optional.ofNullable(orgMap.get(importInfo.get("支部名称"))).map(m -> m.getId()).orElse(null));
-                workerInfo.setInserviceType(1);
                 workerInfo.setUfaceDevId(ufaceId);
                 workerInfo.setWorkAreaName(importInfo.get("工作区域"));
                 workerInfo.setNum(importInfo.get("编号"));
@@ -2186,7 +2185,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
                 workerInfo.setEpcCbs(Optional.ofNullable(epcMap.get(importInfo.get("EPC承包商"))).map(m -> m.getId()).orElse(null));
                 boolean isVaild = IdCardUtils.strongVerifyIdNumber(workerInfo.getIdCard());
                 if (isVaild) {
-                    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());
@@ -2199,6 +2198,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());