|
@@ -71,11 +71,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
|
|
|
unicode = UUID.randomUUID().toString();
|
|
unicode = UUID.randomUUID().toString();
|
|
|
}
|
|
}
|
|
|
technician.setUnicode(unicode);
|
|
technician.setUnicode(unicode);
|
|
|
- //根据年月和工号或身份证
|
|
|
|
|
-// LambdaQueryWrapper<TechnicianEntity> wrapper = Wrappers.<TechnicianEntity>lambdaQuery()
|
|
|
|
|
-// .eq(TechnicianEntity::getYearAndMonth, technician.getYearAndMonth())
|
|
|
|
|
-// .eq(TechnicianEntity::getNumber, technician.getNumber())
|
|
|
|
|
-// .eq(TechnicianEntity::getIdCard, technician.getIdCard());
|
|
|
|
|
|
|
+
|
|
|
LambdaQueryWrapper<TechnicianEntity> wrapper = Wrappers.<TechnicianEntity>lambdaQuery()
|
|
LambdaQueryWrapper<TechnicianEntity> wrapper = Wrappers.<TechnicianEntity>lambdaQuery()
|
|
|
.eq(TechnicianEntity::getYearAndMonth, technician.getYearAndMonth())
|
|
.eq(TechnicianEntity::getYearAndMonth, technician.getYearAndMonth())
|
|
|
.eq(TechnicianEntity::getUnicode, technician.getUnicode());
|
|
.eq(TechnicianEntity::getUnicode, technician.getUnicode());
|
|
@@ -84,10 +80,7 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
|
|
|
//新增
|
|
//新增
|
|
|
return this.save(technician);
|
|
return this.save(technician);
|
|
|
}
|
|
}
|
|
|
-// else {
|
|
|
|
|
-// technician.setId(dbTechnician.getId());
|
|
|
|
|
-// return this.updateById(technician);
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -149,25 +142,21 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
|
|
|
technician.setYearAndMonth(yearAndMonth);
|
|
technician.setYearAndMonth(yearAndMonth);
|
|
|
|
|
|
|
|
if(Func.isNotBlank(excel.getDepartment())){
|
|
if(Func.isNotBlank(excel.getDepartment())){
|
|
|
- LambdaQueryWrapper<DepartmentEntity> eq = Wrappers.<DepartmentEntity>lambdaQuery()
|
|
|
|
|
- .eq(DepartmentEntity::getName, excel.getDepartment())
|
|
|
|
|
- .eq(DepartmentEntity::getYearAndMonth, StringUtil.sub(yearAndMonth, 0, 4));
|
|
|
|
|
- DepartmentEntity dbDepartment = departmentMapper.selectOne(eq);
|
|
|
|
|
- if(Func.isNull(dbDepartment)){
|
|
|
|
|
- throw new ServiceException("序号为["+excel.getXh()+"]的部门/科室/项目部["+excel.getDepartment()+"]不存在");
|
|
|
|
|
|
|
+ List<String> tmpList = Arrays.asList(excel.getDepartment().split("/"));
|
|
|
|
|
+ String department = null;
|
|
|
|
|
+ if(tmpList.size() == 1 || tmpList.size() == 2){
|
|
|
|
|
+ department = tmpList.get(tmpList.size() - 1);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ throw new ServiceException("所属二级单位/部门最多只能有两级,用'/'分隔");
|
|
|
}
|
|
}
|
|
|
- technician.setDepartment(departmentMapper.getFullNameById(dbDepartment.getId()));
|
|
|
|
|
- technician.setDepartmentId(dbDepartment.getId());
|
|
|
|
|
- }else if(Func.isNotBlank(excel.getSecondaryUnit())){
|
|
|
|
|
LambdaQueryWrapper<DepartmentEntity> eq = Wrappers.<DepartmentEntity>lambdaQuery()
|
|
LambdaQueryWrapper<DepartmentEntity> eq = Wrappers.<DepartmentEntity>lambdaQuery()
|
|
|
- .eq(DepartmentEntity::getName, excel.getSecondaryUnit())
|
|
|
|
|
|
|
+ .eq(DepartmentEntity::getName, department)
|
|
|
.eq(DepartmentEntity::getYearAndMonth, StringUtil.sub(yearAndMonth, 0, 4));
|
|
.eq(DepartmentEntity::getYearAndMonth, StringUtil.sub(yearAndMonth, 0, 4));
|
|
|
DepartmentEntity dbDepartment = departmentMapper.selectOne(eq);
|
|
DepartmentEntity dbDepartment = departmentMapper.selectOne(eq);
|
|
|
if(Func.isNull(dbDepartment)){
|
|
if(Func.isNull(dbDepartment)){
|
|
|
- throw new ServiceException("序号为["+excel.getXh()+"]的所属二级单位["+excel.getDepartment()+"]不存在");
|
|
|
|
|
|
|
+ throw new ServiceException("序号为["+excel.getXh()+"]的部门/科室/项目部["+excel.getDepartment()+"]不存在");
|
|
|
}
|
|
}
|
|
|
- technician.setDepartment(departmentMapper.getFullNameById(dbDepartment.getId()));
|
|
|
|
|
- technician.setDepartmentId(dbDepartment.getId());
|
|
|
|
|
|
|
+ technician.setDepartmentId(dbDepartment.getId());
|
|
|
}
|
|
}
|
|
|
this.saveOrUpdateTechnician(technician);
|
|
this.saveOrUpdateTechnician(technician);
|
|
|
}
|
|
}
|