diff --git a/src/main/java/com/example/nto/dto/entity/employee/EmployeeDTO.java b/src/main/java/com/example/nto/dto/entity/employee/EmployeeDTO.java index ac9698f..7ee995a 100644 --- a/src/main/java/com/example/nto/dto/entity/employee/EmployeeDTO.java +++ b/src/main/java/com/example/nto/dto/entity/employee/EmployeeDTO.java @@ -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; diff --git a/src/main/java/com/example/nto/dto/mappers/employee/EmployeeMapper.java b/src/main/java/com/example/nto/dto/mappers/employee/EmployeeMapper.java index 62fae69..8504852 100644 --- a/src/main/java/com/example/nto/dto/mappers/employee/EmployeeMapper.java +++ b/src/main/java/com/example/nto/dto/mappers/employee/EmployeeMapper.java @@ -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);