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/PwrdevAlarmHistoryController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/controller/PwrdevAlarmHistoryController.java b/src/main/java/com/whyc/controller/PwrdevAlarmHistoryController.java
index ca1f429..149d5eb 100644
--- a/src/main/java/com/whyc/controller/PwrdevAlarmHistoryController.java
+++ b/src/main/java/com/whyc/controller/PwrdevAlarmHistoryController.java
@@ -8,10 +8,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.text.ParseException;
import java.util.List;
-@Api(tags = "鐢垫簮鍛婅-鍘嗗彶鍛婅")
+@Api(tags = "鍛婅绠＄悊-鐢垫簮鍘嗗彶鍛婅")
@RestController
@RequestMapping("PwrdevAlarmHistoryAction")
public class PwrdevAlarmHistoryController {
@@ -22,8 +23,9 @@
//鐢垫簮鍘嗗彶鍛婅鏌ヨ
@ApiOperation(value = "鐢垫簮鍘嗗彶鍛婅鏌ヨ",notes = "almTypes,almSource,almStartTime,almStartTime1,pageCurr,pageSize,usrId,stationName1,stationName2,stationName3,stationName5")
@PostMapping("/getHistoryAllPage")
- public Response getHistoryAllPage(@RequestBody PwrdevAlarmHistory pwrH){
- return service.getHistoryAllPage(pwrH);
+ public Response getHistoryAllPage(@RequestBody PwrdevAlarmHistory param) throws ParseException {
+ //return service.getHistoryAllPage(pwrH);
+ return service.getPageInfo(param);
}
//鐢垫睜鍘嗗彶鍛婅鍒犻櫎
@@ -42,8 +44,9 @@
//閫氳鐢垫簮鍘嗗彶鍛婅鏌ヨ
@ApiOperation(value = "閫氳鐢垫簮鍘嗗彶鍛婅鏌ヨ",notes = "almTypes,almSource,almStartTime,almStartTime1,pageCurr,pageSize,usrId,stationName1,stationName2,stationName3,stationName5")
@PostMapping("/getHistoryAllPage2")
- public Response getHistoryAllPage2(@RequestBody PwrdevAlarmHistory pwrH){
- return service.getHistoryAllPage2(pwrH);
+ public Response getHistoryAllPage2(@RequestBody PwrdevAlarmHistory param) throws ParseException {
+ //return service.getHistoryAllPage2(pwrH);
+ return service.getPageInfoForTX(param);
}
}
--
Gitblit v1.9.1