notminus_onlyc/notminusonlycplusplus-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

develop #3

Merged
Petr merged 18 commits from develop into master 2025-02-19 12:37:36 +00:00
Conversation 0 Commits 18 Files Changed 62 +5 -2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3070441490 - Show all commits

3
src/main/java/com/example/nto/dto/entity/employee/EmployeeDTO.java
View File

@ -16,6 +16,7 @@ public class EmployeeDTO {
private String name; private String name;
private String surname; private String surname;
private String patronymic; private String patronymic;
private String aboutMe;
private String telephone; private String telephone;
private String email; private String email;
@ -23,7 +24,7 @@ public class EmployeeDTO {
private String officeName; private String officeName;
private String officeImageUrl; private String officeImageUrl;
private String position; // Название должности private String positionName; // Название должности
private String role; // строка либо ROLE_USER, либо ROLE_ADMIN private String role; // строка либо ROLE_USER, либо ROLE_ADMIN
private String profileImageUrl; private String profileImageUrl;

4
src/main/java/com/example/nto/dto/mappers/employee/EmployeeMapper.java
View File

@ -18,13 +18,14 @@ public class EmployeeMapper {
employeeDTO.setName(employee.getName()); employeeDTO.setName(employee.getName());
employeeDTO.setSurname(employee.getSurname()); employeeDTO.setSurname(employee.getSurname());
employeeDTO.setPatronymic(employee.getPatronymic()); employeeDTO.setPatronymic(employee.getPatronymic());
employeeDTO.setAboutMe(employeeDTO.getAboutMe());
employeeDTO.setTelephone(employee.getTelephone()); employeeDTO.setTelephone(employee.getTelephone());
employeeDTO.setEmail(employee.getEmail()); employeeDTO.setEmail(employee.getEmail());
employeeDTO.setOfficeId(employee.getOffice().getId()); employeeDTO.setOfficeId(employee.getOffice().getId());
employeeDTO.setOfficeName(employee.getOffice().getName()); employeeDTO.setOfficeName(employee.getOffice().getName());
employeeDTO.setOfficeImageUrl(employee.getOffice().getLinkLogo()); employeeDTO.setOfficeImageUrl(employee.getOffice().getLinkLogo());
employeeDTO.setPosition(employee.getPosition().getName()); employeeDTO.setPositionName(employee.getPosition().getName());
employeeDTO.setRole(employee.getRole().getRoleName()); employeeDTO.setRole(employee.getRole().getRoleName());
employeeDTO.setRole(employee.getProfileImageUrl()); employeeDTO.setRole(employee.getProfileImageUrl());
employeeDTO.setBlocked(employee.isBlocked()); employeeDTO.setBlocked(employee.isBlocked());
@ -65,6 +66,7 @@ public class EmployeeMapper {
employee.setName(employeeDTO.getName()); employee.setName(employeeDTO.getName());
employee.setSurname(employeeDTO.getSurname()); employee.setSurname(employeeDTO.getSurname());
employee.setPatronymic(employeeDTO.getPatronymic()); employee.setPatronymic(employeeDTO.getPatronymic());
employeeDTO.setAboutMe(employee.getAboutMe());
employee.setTelephone(employeeDTO.getTelephone()); employee.setTelephone(employeeDTO.getTelephone());
employee.setEmail(employeeDTO.getEmail()); employee.setEmail(employeeDTO.getEmail());
employee.setOffice(office); employee.setOffice(office);