From 353639c22fe263f709179ce0e07c91572ecb9aa7 Mon Sep 17 00:00:00 2001 From: "DozorovaA.A" Date: Tue, 13 Jun 2023 19:46:18 +0400 Subject: [PATCH] add report --- data.mv.db | Bin 45056 -> 40960 bytes .../controller/EmployeeController.java | 26 ++++++++++-------- .../RequestForCooperationController.java | 17 ++++++------ .../speaker/model/RequestForCooperation.java | 3 +- .../repository/IEmployeeRepository.java | 2 +- .../speaker/service/AppointmentService.java | 2 +- 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/data.mv.db b/data.mv.db index 0eb189930e43fbad5059060a5d3f30f636332005..9bea10731bdc327fc7e5dd989ebe7466e0385e86 100644 GIT binary patch literal 40960 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 B*h>Ha literal 45056 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 RvJDIyj-IzGJ-k+r{~u#PldAv# diff --git a/src/main/java/com/example/demo/speaker/controller/EmployeeController.java b/src/main/java/com/example/demo/speaker/controller/EmployeeController.java index ddb30f8..45b6d33 100644 --- a/src/main/java/com/example/demo/speaker/controller/EmployeeController.java +++ b/src/main/java/com/example/demo/speaker/controller/EmployeeController.java @@ -15,7 +15,7 @@ import java.util.List; public class EmployeeController { private final EmployeeService employeeService; private final RequestForCooperationService requestForCooperationService; - private final AppointmentService appointmentService; + private final AppointmentService appointmentService; public EmployeeController(EmployeeService employeeService, RequestForCooperationService requestForCooperationService, AppointmentService appointmentService) { @@ -40,9 +40,11 @@ public class EmployeeController { return new EmployeeDTO(employeeService.addWorker(new EmployeeDTO(Employee))); } - @PutMapping("/{id}") - public EmployeeDTO updateWorker(@PathVariable Long id,@RequestBody EmployeeDTO employeeDTO) { - return new EmployeeDTO(employeeService.updateReportWorker(id, employeeDTO)); + @PutMapping("/update") + public EmployeeDTO updateWorker(@RequestParam("id") Long id, @RequestParam("name") String name) { + var emp = employeeService.findWorker(id); + emp.setFio(name); + return new EmployeeDTO(employeeService.updateReportWorker(id, new EmployeeDTO(emp))); } @DeleteMapping("/{id}") @@ -51,15 +53,17 @@ public class EmployeeController { } @GetMapping("/id={id}") - public List getListOfReports(@PathVariable Long id) { - var employee = employeeService.findWorker(id); - return employeeService.findAllRequestsOfEmployee(employee); + public List getListOfReports(@PathVariable Long id) { + var employee = employeeService.findWorker(id); + return employeeService.findAllRequestsOfEmployee(employee); } - @GetMapping("/postId={postId}") - public List getListOfWorkers(@RequestParam("postId") Long id) { - final Appointment appointment = appointmentService.findAppointment(id); - return employeeService.findWorkerByPost(appointment); + @GetMapping("/postid={id}") + public List getListOfWorkers(@PathVariable Long id) { + final Appointment appointment = appointmentService.findAppointment(id); + var res = employeeService.findWorkerByPost(appointment); + return res; + //return new ArrayList(); } } diff --git a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java b/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java index 2ff3e50..a65b4b5 100644 --- a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java +++ b/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java @@ -7,6 +7,9 @@ import com.example.demo.speaker.service.EmployeeService; import com.example.demo.speaker.service.RequestForCooperationService; import org.springframework.web.bind.annotation.*; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -34,17 +37,15 @@ public class RequestForCooperationController { } @PostMapping("/add") - public RequestForCooperation createRequest(@PathVariable Long nameCompany, - @PathVariable String comment, - @PathVariable Integer isActive, - @PathVariable Long sort, - @PathVariable Long type - ){ + public RequestForCooperation createRequest(@RequestParam Long nameCompany, + @RequestParam String comment + ) throws ParseException { //@RequestBody RequestForCooperationDTO requestDTO) { var company = companyService.findCompany(nameCompany); -var emp = employeeService.findWorker(sort); - var request = new RequestForCooperation(company, new Date(), type == 0 ? TypeOfRequestEnum.DEVELOP : TypeOfRequestEnum.TRACKING, comment); +var emp = employeeService.findWorker(1L); + DateFormat form = new SimpleDateFormat("yyyy-MM-dd"); + var request = new RequestForCooperation(656656L, company, form.parse("2023-06-13"), TypeOfRequestEnum.DEVELOP, comment, emp); return requestForCooperationService.addRequest(new RequestForCooperationDTO(request)); } diff --git a/src/main/java/com/example/demo/speaker/model/RequestForCooperation.java b/src/main/java/com/example/demo/speaker/model/RequestForCooperation.java index e57d82a..f3db9df 100644 --- a/src/main/java/com/example/demo/speaker/model/RequestForCooperation.java +++ b/src/main/java/com/example/demo/speaker/model/RequestForCooperation.java @@ -34,12 +34,13 @@ public class RequestForCooperation { this.typeSotr = type; this.id = r.nextLong(); } - public RequestForCooperation(Long id, Company name, Date createDate, TypeOfRequestEnum type, String text) { + public RequestForCooperation(Long id, Company name, Date createDate, TypeOfRequestEnum type, String text, Employee emp) { this.nameCompany = name; this.createDate = createDate; this.comment = text; this.typeSotr = type; this.id = id; + this.sotr = emp; } public Company getName() diff --git a/src/main/java/com/example/demo/speaker/repository/IEmployeeRepository.java b/src/main/java/com/example/demo/speaker/repository/IEmployeeRepository.java index b6692bf..b98fc6c 100644 --- a/src/main/java/com/example/demo/speaker/repository/IEmployeeRepository.java +++ b/src/main/java/com/example/demo/speaker/repository/IEmployeeRepository.java @@ -10,7 +10,7 @@ import org.springframework.data.repository.query.Param; import java.util.List; public interface IEmployeeRepository extends JpaRepository { - @Query("SELECT DISTINCT p.fio FROM Employee p where :appointment = p.appointment") + @Query("SELECT DISTINCT p FROM Employee p where :appointment = p.appointment") List getEmployeeByAppointment(@Param("appointment") Appointment appointment); @Query("SELECT DISTINCT p FROM RequestForCooperation p where :employee = p.sotr") diff --git a/src/main/java/com/example/demo/speaker/service/AppointmentService.java b/src/main/java/com/example/demo/speaker/service/AppointmentService.java index 67b37f6..7bbfbb8 100644 --- a/src/main/java/com/example/demo/speaker/service/AppointmentService.java +++ b/src/main/java/com/example/demo/speaker/service/AppointmentService.java @@ -35,7 +35,7 @@ private final IAppointmentRepository appointmentRepository; @Transactional(readOnly = true) public Appointment findAppointment(Long id) { final Optional appointment = appointmentRepository.findById(id); - return appointment.orElseThrow(()->new AppointmentNotFoundException(id)); + return appointment.get(); } @Transactional(readOnly = true)