From ce10da906c58596fce43bffa6a6d177268ca177b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 30 四月 2024 00:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 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..6fdbcdc 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,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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 +12,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 +23,34 @@
public class ReportController {
private ReportService reportService;
-
+ @ValueClassify("涓汉棣栭〉")
@ApiOperation(value = "姣忔棩涓氬姟缁熻")
@GetMapping("/businessStatisticsByDay")
public Result businessStatisticsByDay(){
return Result.success(reportService.businessStatisticsByDay());
}
-
+ @ValueClassify("涓汉棣栭〉")
@ApiOperation(value = "妫�娴嬮」鐩粺璁�")
@GetMapping("/testProductByDay")
public Result testProductByDay(){
return Result.success(reportService.testProductByDay());
}
+ @ValueClassify("涓汉棣栭〉")
+ @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));
+ }
+ @ValueClassify("涓汉棣栭〉")
+ @ApiOperation(value = "棣栭〉-->鎴戠殑鏃ョ▼")
+ @PostMapping("/ScheduleByMe")
+ public Result ScheduleByMe(String date){
+ return Result.success(reportService.ScheduleByMe(date));
+ }
}
--
Gitblit v1.9.3