From 0c5730d1536368c4b6f34d85f34ed3cf89562bf2 Mon Sep 17 00:00:00 2001
From: whj <2330367145>
Date: Thu, 21 Nov 2024 11:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=80=81=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E6=89=8B=E5=B7=A5=E5=BD=95=E5=85=A5=E6=98=BE=E7=A4=BA=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=E5=92=8C=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/sqlmap/StaffTemporaryMapper.xml |  6 +++++-
 .../manage/service/impl/SsmBaseStaffServiceImpl.java   | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dm_dao/src/main/resources/sqlmap/StaffTemporaryMapper.xml b/dm_dao/src/main/resources/sqlmap/StaffTemporaryMapper.xml
index 12c690a..b3dd820 100644
--- a/dm_dao/src/main/resources/sqlmap/StaffTemporaryMapper.xml
+++ b/dm_dao/src/main/resources/sqlmap/StaffTemporaryMapper.xml
@@ -387,7 +387,11 @@
     </select>
 
     <select id="selectLastRuzhiByIdentityCard" resultMap="BaseResultMap">
-        SELECT * FROM `staff_temporary`
+        SELECT d, scan_time, staff_name, mobile_phone, identity_type, identity_card, type, sex, store_id, region_id,
+               state, end_type, end_id, end_name, end_time, is_beisen, send_id, send_name, send_time,
+               email, staff_num, is_zhongkong, send_zhongkong_id, send_zhongkong_name, send_zhongkong_time, beisen_dimission,
+               beisen_dimission_date, zhongkong_dimission, zhongkong_dimission_date, is_update, zhongkong_dept_id, zhongkong_dept_num,
+               zhongkong_dept_name, beisen_dept_id, beisen_dept_num, beisen_dept_name, urgent_name, urgent_phone, urgent_relationship, remark FROM `staff_temporary`
         WHERE `identity_card` = #{identityCard}
         ORDER BY `ruzhi_time` DESC
         LIMIT 1
diff --git a/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java b/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java
index 0e687d6..e419d12 100644
--- a/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java
+++ b/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java
@@ -1141,6 +1141,7 @@ public class SsmBaseStaffServiceImpl extends BaseServiceImpl<BaseStaff> implemen
 
         // 查询有没有员工，判断是否是异常状态
         Example blackExample = new Example(BlackList.class);
+        blackExample.selectProperties("identityCard","type","mobilePhone","staffName");
         Example.Criteria blackExampleCriteria = blackExample.createCriteria();
         blackExampleCriteria.andEqualTo(BlackListDto.Fields.identityCard, identityCard);
         List<BlackList> blackLists = blackListDao.selectByExample(blackExample);
@@ -1171,12 +1172,15 @@ public class SsmBaseStaffServiceImpl extends BaseServiceImpl<BaseStaff> implemen
         if (lastRuzhiStaffTemp == null) {
             String staffNum = getStaffNum(staffRequest.getStoreId(),identityCard);
             temporary.setStaffNum(staffNum);
+            StaffTemporaryNumber staffTemporaryNumber = new StaffTemporaryNumber();
+            BeanUtils.copyProperties(temporary,staffTemporaryNumber);
+            staffTemporaryNumberService.save(staffTemporaryNumber);
 
         }
         staffTemporaryDao.insert(temporary);
-        StaffTemporaryNumber staffTemporaryNumber = new StaffTemporaryNumber();
-        BeanUtils.copyProperties(temporary,staffTemporaryNumber);
-        staffTemporaryNumberService.save(staffTemporaryNumber);
+//        StaffTemporaryNumber staffTemporaryNumber = new StaffTemporaryNumber();
+//        BeanUtils.copyProperties(temporary,staffTemporaryNumber);
+//        staffTemporaryNumberService.save(staffTemporaryNumber);
 
         // 进行检验防止编号重复
 //        Example staffTempExample = new Example(StaffTemporary.class);