From 3e6ac0b05ec1ee4456c7402f17677e449a3dcc09 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 27 五月 2025 15:45:28 +0800
Subject: [PATCH] 去除>1800(30分钟)的过滤条件
---
src/main/java/com/whyc/controller/BattTestInfController.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattTestInfController.java b/src/main/java/com/whyc/controller/BattTestInfController.java
index 36426d6..3fb8cf1 100644
--- a/src/main/java/com/whyc/controller/BattTestInfController.java
+++ b/src/main/java/com/whyc/controller/BattTestInfController.java
@@ -4,7 +4,6 @@
import com.whyc.dto.Response;
import com.whyc.service.BattTestInfDataService;
import com.whyc.service.BattTestInfService;
-import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,30 +11,37 @@
@RestController
@Api(tags = "鐢垫睜缁勫厖鏀剧數璁板綍")
-@RequestMapping("tinf")
+@RequestMapping("battTestInf")
public class BattTestInfController {
@Autowired
private BattTestInfService service;
@Autowired
private BattTestInfDataService dataService;
- @ApiOperation("鏌ヨ鍏呮斁鐢佃褰�")
- @GetMapping("getTinfHis")
- public Response getTinfHis(@RequestParam int binfId
+ /*@ApiOperation("鏌ヨ鍒嗛〉-鐢垫睜缁勭殑鍏呮斁鐢佃褰�")
+ @GetMapping("getPageByBattGroupId")
+ public Response getPageByBattGroupId(@RequestParam int battGroupId
, @RequestParam int pageNum, @RequestParam int pageSize){
- Response res=service.getTinfHis(binfId,pageNum,pageSize);
- return res;
+ return service.getPageByBattGroupId(battGroupId,pageNum,pageSize);
+ }*/
+
+ @ApiOperation("鏌ヨ鍒嗛〉-鐢垫睜缁勭殑鏀剧數璁板綍")
+ @GetMapping("getDischargePage")
+ public Response getDischargePage(@RequestParam int pageNum,@RequestParam int pageSize,
+ @RequestParam(required = false) Integer battGroupId){
+ return service.getDischargePage(pageNum,pageSize,battGroupId);
}
- @ApiOperation("鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�")
- @GetMapping("getTDataHis")
- public Response getTDataHis(@RequestParam int binfId,@RequestParam int testRecordCount){
- Response res=dataService.getTDataHis(binfId,testRecordCount);
+ /*//鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�
+ @ApiOperation("鏌ヨ鍗曟鏀剧數璁板綍璇︽儏")
+ @GetMapping("getByBattGroupIdAndTestRecordCount")
+ public Response getByBattGroupIdAndTestRecordCount(@RequestParam int battGroupId,@RequestParam int testRecordCount){
+ Response res=dataService.getByBattGroupIdAndTestRecordCount(battGroupId,testRecordCount);
return res;
- }
+ }*/
- @PostMapping("searchGroupAssess")
+ /*@PostMapping("searchGroupAssess")
@ApiOperation(value = "钃勭數姹犵粍鍚庤瘎浼�")
public Response searchByCondition(@RequestParam int pageNum,@RequestParam int pageSize, @RequestBody ReportBattDTO tinf) {
return service.searchGroupAssess(pageNum,pageSize,tinf,1001);
@@ -46,6 +52,6 @@
@ApiOperation(value = "鐢垫睜鍗曚綋鎬ц兘璇勪及")
public Response searchMonNumAssess(@RequestParam int binfId,@RequestParam int monNum){
return service.searchMonNumAssess(binfId,monNum);
- }
+ }*/
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1