From bc7d9c98bc1b23ef6ef29ed4a6313753f6900640 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期二, 14 五月 2024 02:25:01 +0800 Subject: [PATCH] 费用统计查询修复; 检验下单字段调整; 下单进度查询修改; 执行优化去掉多余模板内容; 报告生成删除试验方法; 修改报告表格列宽; 修改报告删除列的统计方法 --- inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 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..3841c3d 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,6 +2,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yuanchu.mom.annotation.ValueAuth; +import com.yuanchu.mom.annotation.ValueClassify; import com.yuanchu.mom.dto.SampleOrderDto; import com.yuanchu.mom.service.ReportService; import com.yuanchu.mom.utils.JackSonUtil; @@ -11,6 +13,8 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Map; @RestController @@ -20,16 +24,34 @@ public class ReportController { private ReportService reportService; - + @ValueAuth @ApiOperation(value = "姣忔棩涓氬姟缁熻") @GetMapping("/businessStatisticsByDay") public Result businessStatisticsByDay(){ return Result.success(reportService.businessStatisticsByDay()); } - + @ValueAuth @ApiOperation(value = "妫�娴嬮」鐩粺璁�") @GetMapping("/testProductByDay") public Result testProductByDay(){ return Result.success(reportService.testProductByDay()); } + @ValueAuth + @ApiOperation(value = "棣栭〉-->鏃ュ巻浠诲姟鍥�") + @GetMapping("/calendarWorkByWeek") + public Result calendarWorkByWeek(){ + return Result.success(reportService.calendarWorkByWeek()); + } + @ValueClassify("涓汉棣栭〉") + @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)); + } } -- Gitblit v1.9.3