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 | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/whyc/controller/BattTestInfController.java b/src/main/java/com/whyc/controller/BattTestInfController.java index 42467c1..3fb8cf1 100644 --- a/src/main/java/com/whyc/controller/BattTestInfController.java +++ b/src/main/java/com/whyc/controller/BattTestInfController.java @@ -18,20 +18,27 @@ @Autowired private BattTestInfDataService dataService; - @ApiOperation("鏌ヨ鍒嗛〉-鐢垫睜缁勭殑鍏呮斁鐢佃褰�") + /*@ApiOperation("鏌ヨ鍒嗛〉-鐢垫睜缁勭殑鍏呮斁鐢佃褰�") @GetMapping("getPageByBattGroupId") public Response getPageByBattGroupId(@RequestParam int battGroupId , @RequestParam int pageNum, @RequestParam int pageSize){ 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("getByBattGroupIdAndTestRecordCount") public Response getByBattGroupIdAndTestRecordCount(@RequestParam int battGroupId,@RequestParam int testRecordCount){ Response res=dataService.getByBattGroupIdAndTestRecordCount(battGroupId,testRecordCount); return res; - } + }*/ /*@PostMapping("searchGroupAssess") -- Gitblit v1.9.1