|
|
@@ -141,7 +141,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
|
|
|
List<TechnicianExcel> data = ExcelUtil.read(file, 0, 2, TechnicianExcel.class);
|
|
|
|
|
|
List<TechnicianEntity> dbTechnicianList = baseMapper.selectList(Wrappers.<TechnicianEntity>lambdaQuery().eq(TechnicianEntity::getYearAndMonth, yearAndMonth));
|
|
|
- List<String> identifierList = new ArrayList<>(dbTechnicianList.stream().map(tmp -> tmp.getNumber() + ":" + tmp.getIdCard() + ":").toList());
|
|
|
+ List<String> identifierList = new ArrayList<>(dbTechnicianList.stream().map(tmp -> tmp.getNumber() + ":" + tmp.getIdCard()).toList());
|
|
|
|
|
|
List<TechnicianEntity> insertList = new ArrayList<>();
|
|
|
|
|
|
@@ -177,10 +177,11 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
|
|
|
technician.setDepartmentId(dbDepartment.getId());
|
|
|
}
|
|
|
String unicode = baseMapper.getUnicodeByNumberAndIdentityCard(technician.getNumber(), technician.getIdCard());
|
|
|
- if (unicode != null) {
|
|
|
- continue;
|
|
|
+ if (unicode == null) {
|
|
|
+ unicode = UUID.randomUUID().toString();
|
|
|
+// continue;
|
|
|
}
|
|
|
- technician.setUnicode(UUID.randomUUID().toString());
|
|
|
+ technician.setUnicode(unicode);
|
|
|
|
|
|
insertList.add(technician);
|
|
|
if (insertList.size() % 20 == 0) {
|