From 4686c2a9736d7d87609eaf6d96498f6412ed435f Mon Sep 17 00:00:00 2001 From: "DozorovaA.A" Date: Tue, 13 Jun 2023 11:31:07 +0400 Subject: [PATCH] work with employee --- data.mv.db | Bin 90112 -> 77824 bytes .../controller/DTO/AppointmentDTO.java | 4 +++ .../speaker/controller/DTO/CompanyDTO.java | 17 +++++++++ .../speaker/controller/DTO/EmployeeDTO.java | 15 ++++++-- .../DTO/RequestForCooperationDTO.java | 28 +++++++++++++++ .../MVCController/EmployeeMVCController.java | 15 ++++---- .../example/demo/speaker/model/Employee.java | 2 +- .../demo/speaker/service/EmployeeService.java | 2 +- src/main/resources/templates/appointment.html | 4 +-- src/main/resources/templates/employee.html | 33 ++++++++++++++---- 10 files changed, 99 insertions(+), 21 deletions(-) diff --git a/data.mv.db b/data.mv.db index 8f3d4072eb2605d2353d5c3e4524d2173e2cfcb3..8c185a17c4c428cc4b70d06d57614eb2e51ba651 100644 GIT binary patch literal 77824 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 literal 90112 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 bX8k=~|F_fie?(h#sHvz&UoJoJipl>E(xE+I diff --git a/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java index 14c16da..3cbd1ce 100644 --- a/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java @@ -19,4 +19,8 @@ public class AppointmentDTO { public String getName() { return name; } + + public void setName(String nameAppointment){ + this.name = nameAppointment; + } } diff --git a/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java index 3706861..f3aa38a 100644 --- a/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java @@ -39,4 +39,21 @@ public class CompanyDTO { public String getLegalAdressCompany() { return legalAdressCompany; } + public void setNameCompany(String name) + { + this.nameCompany = name; + } + + public void setAdressCompany(String adressCompany) { + this.adressCompany = adressCompany; + } + + public void setContactEmail(String contactEmail) { + this.contactEmail = contactEmail; + } + + public void setLegalAdressCompany(String legalAdressCompany) { + this.legalAdressCompany = legalAdressCompany; + } + } diff --git a/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java index 90e7b86..8e06742 100644 --- a/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java @@ -5,18 +5,27 @@ import com.example.demo.speaker.model.Employee; public class EmployeeDTO { private Long id; private String fio; - private AppointmentDTO appointment; + private Long appointmentId; public EmployeeDTO(Employee employee) { this.id = employee.getId(); this.fio = employee.getFio(); - this.appointment = new AppointmentDTO(employee.getPost()); + this.appointmentId = employee.getPost().getId(); } + public EmployeeDTO(){} public Long getId() { return id; } - public AppointmentDTO getAppointment() { return appointment; } + public Long getAppointmentId() { return appointmentId; } public String getFio() { return fio; } + + public void setAppointment(Long appointment) { + this.appointmentId = appointment; + } + + public void setFio(String fio) { + this.fio = fio; + } } diff --git a/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java index f24b534..273bd29 100644 --- a/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java @@ -43,4 +43,32 @@ public class RequestForCooperationDTO { public EmployeeDTO getSotr() { return sotr; } public TypeOfRequestEnum getType() {return type; } + + public void setActive(Boolean active) { + isActive = active; + } + + public void setApproveDate(Date approveDate) { + this.approveDate = approveDate; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + public void setNameCompany(Company nameCompany) { + this.nameCompany = nameCompany; + } + + public void setSotr(EmployeeDTO sotr) { + this.sotr = sotr; + } + + public void setType(TypeOfRequestEnum type) { + this.type = type; + } } diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java index d655cd9..353f8f6 100644 --- a/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java @@ -36,21 +36,22 @@ public class EmployeeMVCController { .toList()); model.addAttribute("appointments", appointmentService.findAllAppointments().stream().map(AppointmentDTO::new).toList()); + model.addAttribute("employeeDTO", new EmployeeDTO()); + return "employee"; } @PostMapping("/create") - public String createWorker(@RequestParam("name") String name, @RequestParam("appointmentId") Long appointmentId, Model model) { - var Employee = new Employee(name, appointmentService.findAppointment(appointmentId)); - model.addAttribute("employee",new EmployeeDTO(employeeService.addWorker(new EmployeeDTO(Employee)))); + public String createWorker(@ModelAttribute EmployeeDTO employeeDTO, Model model) { + employeeService.addWorker(employeeDTO); return "redirect:employee"; } @PostMapping("/edit/{id}") - public String updateWorker(@PathVariable Long id,@ModelAttribute("employee") EmployeeDTO employee, Model model) { - employeeService.updateReportWorker(id, employee); - model.addAttribute("employees", employeeService.findAllWorkers()); - model.addAttribute("appointments", appointmentService.findAllAppointments()); + public String updateWorker(@PathVariable Long id,@ModelAttribute("employeeDTO") EmployeeDTO employeeDTO, Model model) { + employeeService.updateReportWorker(id, employeeDTO); +// model.addAttribute("employees", employeeService.findAllWorkers()); +// model.addAttribute("appointments", appointmentService.findAllAppointments()); return "redirect:employee"; } diff --git a/src/main/java/com/example/demo/speaker/model/Employee.java b/src/main/java/com/example/demo/speaker/model/Employee.java index 93b82ba..ba8bd84 100644 --- a/src/main/java/com/example/demo/speaker/model/Employee.java +++ b/src/main/java/com/example/demo/speaker/model/Employee.java @@ -10,7 +10,7 @@ import java.util.Random; public class Employee { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.AUTO) private Long id; @Column(nullable = false) private String fio; diff --git a/src/main/java/com/example/demo/speaker/service/EmployeeService.java b/src/main/java/com/example/demo/speaker/service/EmployeeService.java index a8efd39..6f170f4 100644 --- a/src/main/java/com/example/demo/speaker/service/EmployeeService.java +++ b/src/main/java/com/example/demo/speaker/service/EmployeeService.java @@ -23,7 +23,7 @@ private final AppointmentService appointmentService; @Transactional public Employee addWorker(EmployeeDTO employee) { - var appontment = appointmentService.findAppointment(employee.getAppointment().getId()); + var appontment = appointmentService.findAppointment(employee.getAppointmentId()); Employee employeeNew = new Employee(employee.getFio(), appontment); employeeRepository.save(employeeNew); return employeeNew; diff --git a/src/main/resources/templates/appointment.html b/src/main/resources/templates/appointment.html index f5c3762..99bada8 100644 --- a/src/main/resources/templates/appointment.html +++ b/src/main/resources/templates/appointment.html @@ -32,8 +32,8 @@ -
- + + diff --git a/src/main/resources/templates/employee.html b/src/main/resources/templates/employee.html index 7efba38..98fdcd2 100644 --- a/src/main/resources/templates/employee.html +++ b/src/main/resources/templates/employee.html @@ -6,25 +6,44 @@
+
+ +
+ + +
+ +
+ +
+ +
+
- +
IDИмяСотрудник
- -
- +
+ + - +