feat: update EmployeeDTO
This commit is contained in:
parent
4545f1de5e
commit
3070441490
@ -16,6 +16,7 @@ public class EmployeeDTO {
|
||||
private String name;
|
||||
private String surname;
|
||||
private String patronymic;
|
||||
private String aboutMe;
|
||||
private String telephone;
|
||||
private String email;
|
||||
|
||||
@ -23,7 +24,7 @@ public class EmployeeDTO {
|
||||
private String officeName;
|
||||
private String officeImageUrl;
|
||||
|
||||
private String position; // Название должности
|
||||
private String positionName; // Название должности
|
||||
private String role; // строка либо ROLE_USER, либо ROLE_ADMIN
|
||||
|
||||
private String profileImageUrl;
|
||||
|
@ -18,13 +18,14 @@ public class EmployeeMapper {
|
||||
employeeDTO.setName(employee.getName());
|
||||
employeeDTO.setSurname(employee.getSurname());
|
||||
employeeDTO.setPatronymic(employee.getPatronymic());
|
||||
employeeDTO.setAboutMe(employeeDTO.getAboutMe());
|
||||
employeeDTO.setTelephone(employee.getTelephone());
|
||||
employeeDTO.setEmail(employee.getEmail());
|
||||
|
||||
employeeDTO.setOfficeId(employee.getOffice().getId());
|
||||
employeeDTO.setOfficeName(employee.getOffice().getName());
|
||||
employeeDTO.setOfficeImageUrl(employee.getOffice().getLinkLogo());
|
||||
employeeDTO.setPosition(employee.getPosition().getName());
|
||||
employeeDTO.setPositionName(employee.getPosition().getName());
|
||||
employeeDTO.setRole(employee.getRole().getRoleName());
|
||||
employeeDTO.setRole(employee.getProfileImageUrl());
|
||||
employeeDTO.setBlocked(employee.isBlocked());
|
||||
@ -65,6 +66,7 @@ public class EmployeeMapper {
|
||||
employee.setName(employeeDTO.getName());
|
||||
employee.setSurname(employeeDTO.getSurname());
|
||||
employee.setPatronymic(employeeDTO.getPatronymic());
|
||||
employeeDTO.setAboutMe(employee.getAboutMe());
|
||||
employee.setTelephone(employeeDTO.getTelephone());
|
||||
employee.setEmail(employeeDTO.getEmail());
|
||||
employee.setOffice(office);
|
||||
|
Loading…
x
Reference in New Issue
Block a user