From 97bb7a8832281eafe0ef947ea095258d355e52f5 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 30 十二月 2024 15:57:51 +0800 Subject: [PATCH] 无源器件的数采+电路模版查询 --- inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 63 +++++++++++++++++++++++++------ 1 files changed, 51 insertions(+), 12 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java index 14a1e42..df5c991 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java @@ -2,34 +2,73 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yuanchu.mom.dto.SampleOrderDto; +import com.yuanchu.mom.annotation.ValueAuth; +import com.yuanchu.mom.annotation.ValueClassify; import com.yuanchu.mom.service.ReportService; -import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.Map; - @RestController @AllArgsConstructor @RequestMapping("/report") -@Api("鎶ヨ〃妯″潡") +@Api(tags = "鎶ヨ〃妯″潡") public class ReportController { private ReportService reportService; - @ApiOperation(value = "姣忔棩涓氬姟缁熻") + @ValueClassify("缁熻鍥捐〃") + @ApiOperation(value = "鏌ヨ姣忔棩涓氬姟缁熻") @GetMapping("/businessStatisticsByDay") - public Result businessStatisticsByDay(){ - return Result.success(reportService.businessStatisticsByDay()); + public Result businessStatisticsByDay(String startTime,String endTime,String type){ + return Result.success(reportService.businessStatisticsByDay(startTime,endTime,type)); + } + @ValueClassify("缁熻鍥捐〃") + @ApiOperation(value = "鏌ヨ妫�娴嬮」鐩粺璁�") + @GetMapping("/testProductByDay") + public Result testProductByDay(String startTime,String endTime,String type){ + return Result.success(reportService.testProductByDay(startTime,endTime,type)); + } + @ValueAuth + @ApiOperation(value = "鏌ヨ鏃ュ巻浠诲姟鍥�") + @GetMapping("/calendarWorkByWeek") + public Result calendarWorkByWeek(){ + return Result.success(reportService.calendarWorkByWeek()); } - @ApiOperation(value = "妫�娴嬮」鐩粺璁�") - @GetMapping("/testProductByDay") - public Result testProductByDay(){ - return Result.success(reportService.testProductByDay()); + @ValueAuth + @ApiOperation(value = "娣诲姞鏃ョ▼") + @PostMapping("/addSchedule") + public Result addSchedule(String time, String text){ + return Result.success(reportService.addSchedule(time,text)); + } + @ValueAuth + @ApiOperation(value = "鏌ヨ鎴戠殑鏃ョ▼") + @PostMapping("/ScheduleByMe") + public Result ScheduleByMe(String date){ + return Result.success(reportService.ScheduleByMe(date)); + } + + @ValueAuth + @ApiOperation(value = "鍚勭珯鐐瑰伐鏃�") + @PostMapping("/manHourByStation") + public Result manHourByStation(String startTime,String endTime,String sonLaboratory){ + return Result.success(reportService.manHourByStation(startTime,endTime,sonLaboratory)); + } + + @ValueAuth + @ApiOperation(value = "鍚勭珯鐐瑰伐鏃舵瘡涓汉鎵�鍗犵櫨鍒嗘瘮") + @PostMapping("/manHourByPerson") + public Result manHourByPerson(String startTime,String endTime,String sonLaboratory){ + return Result.success(reportService.manHourByPerson(startTime,endTime,sonLaboratory)); + } + + @ValueClassify("缁熻鍥捐〃") + @ApiOperation(value = "鏌ヨ绔欑偣鐨勬楠屾椂闀�") + @PostMapping("/timeByStation") + public Result timeByStation(String startTime, String endTime, Page page,String sonLaboratory){ + return Result.success(reportService.timeByStation(startTime,endTime,page,sonLaboratory)); } } -- Gitblit v1.9.3