解决老员工手工录入显示操作异常问题和一些优化

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

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,13 +1172,16 @@ public class SsmBaseStaffServiceImpl extends BaseServiceImpl<BaseStaff> implemen
         if (lastRuzhiStaffTemp == null) {
             String staffNum = getStaffNum(staffRequest.getStoreId(),identityCard);
             temporary.setStaffNum(staffNum);
-
-        }
-        staffTemporaryDao.insert(temporary);
             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);
+
         // 进行检验防止编号重复
 //        Example staffTempExample = new Example(StaffTemporary.class);
 //        Example.Criteria criteria = staffTempExample.createCriteria();