From 929c6698f4d7598997fc233e09c39c3bdce9fcf8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 10:23:15 +0800
Subject: [PATCH] 判断合格绝对值的问题
---
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 bc672bf..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
@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.service.ReportService;
@@ -8,10 +9,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-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;
+import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@@ -56,14 +54,21 @@
@ValueAuth
@ApiOperation(value = "鍚勭珯鐐瑰伐鏃�")
@PostMapping("/manHourByStation")
- public Result manHourByStation(String startTime,String endTime){
- return Result.success(reportService.manHourByStation(startTime,endTime));
+ 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){
- return Result.success(reportService.manHourByPerson(startTime,endTime));
+ 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