From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001 From: lxw <810412026@qq.com> Date: 星期二, 15 八月 2023 08:49:47 +0800 Subject: [PATCH] 审批页面修改 --- src/main/java/com/whyc/controller/DevalarmDataHistoryController.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java b/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java index b529c50..3c8fe3b 100644 --- a/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java +++ b/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java @@ -8,7 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -@Api(tags="璁惧鍛婅-鍘嗗彶鍛婅") +import java.text.ParseException; + +@Api(tags="鍛婅绠$悊-璁惧鍛婅鍘嗗彶鏌ヨ") @RestController @RequestMapping("DevalarmDataHistoryAction") public class DevalarmDataHistoryController { @@ -18,14 +20,15 @@ //璁惧鍛婅鍘嗗彶鏌ヨ @ApiOperation(value = "璁惧鍛婅鍘嗗彶鏌ヨ") - @PostMapping("/serchByCondition") - public Response serchByCondition(@RequestBody DevAlarmPar par){ - return service.serchByCondition(par); + @PostMapping("serchByCondition") + public Response serchByCondition(@RequestBody DevAlarmPar param) throws ParseException { + //return service.serchByCondition(par); + return service.getPageInfo(param); } //璁惧鍛婅鍒犻櫎鍛婅 @ApiOperation(value = "璁惧鍛婅鍒犻櫎鍛婅") - @GetMapping("/delete") + @GetMapping("delete") public Response delete(@RequestParam int num){ return service.delete(num); } -- Gitblit v1.9.1