From aad28a866d7d200e1228f7a5d053348e7f9653a4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 17 十二月 2024 13:47:38 +0800
Subject: [PATCH] 统计+首页+电路试验提交bug
---
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 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 b4a356a..bc672bf 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
@@ -1,55 +1,69 @@
package com.yuanchu.mom.controller;
-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.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Map;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
@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));
}
-
- @ApiOperation(value = "妫�娴嬮」鐩粺璁�")
+ @ValueClassify("缁熻鍥捐〃")
+ @ApiOperation(value = "鏌ヨ妫�娴嬮」鐩粺璁�")
@GetMapping("/testProductByDay")
- public Result testProductByDay(){
- return Result.success(reportService.testProductByDay());
+ public Result testProductByDay(String startTime,String endTime,String type){
+ return Result.success(reportService.testProductByDay(startTime,endTime,type));
}
-
- @ApiOperation(value = "棣栭〉-->鏃ュ巻浠诲姟鍥�")
+ @ValueAuth
+ @ApiOperation(value = "鏌ヨ鏃ュ巻浠诲姟鍥�")
@GetMapping("/calendarWorkByWeek")
public Result calendarWorkByWeek(){
return Result.success(reportService.calendarWorkByWeek());
}
- @ApiOperation(value = "棣栭〉-->娣诲姞鏃ョ▼")
+ @ValueAuth
+ @ApiOperation(value = "娣诲姞鏃ョ▼")
@PostMapping("/addSchedule")
public Result addSchedule(String time, String text){
return Result.success(reportService.addSchedule(time,text));
}
-
- @ApiOperation(value = "棣栭〉-->鎴戠殑鏃ョ▼")
+ @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){
+ return Result.success(reportService.manHourByStation(startTime,endTime));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "鍚勭珯鐐瑰伐鏃舵瘡涓汉鎵�鍗犵櫨鍒嗘瘮")
+ @PostMapping("/manHourByPerson")
+ public Result manHourByPerson(String startTime,String endTime){
+ return Result.success(reportService.manHourByPerson(startTime,endTime));
+ }
}
--
Gitblit v1.9.3