From 79beef6692964e14bc4f065faf4bd6e3d83f6574 Mon Sep 17 00:00:00 2001
From: zj <1376702416@qq.com>
Date: Tue, 8 Jun 2021 10:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EarlyWarningEOController.java  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
index 973f506c..950470bf 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
@@ -30,14 +30,14 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
 
     @GetMapping("/StandWarning")
     @ApiOperation("标准预警查询")
-    public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "current1")int current1, @RequestParam(defaultValue = "10", value = "pageSize1") int pageSize1,
-                                       @RequestParam(defaultValue = "1", value = "current2")int current2, @RequestParam(defaultValue = "10", value = "pageSize2") int pageSize2,
-                                       @RequestParam(defaultValue = "1", value = "current3")int current3, @RequestParam(defaultValue = "10", value = "pageSize3") int pageSize3,
-                                       @RequestParam(defaultValue = "1", value = "current4")int current4, @RequestParam(defaultValue = "10", value = "pageSize4") int pageSize4,String applyType) {
-        IPage<EarlyWarningEO> list1 = earlyWarningEOService.newStandQuery(current1,pageSize1,applyType);//新车标准预警
-        IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldStandQuery(current2,pageSize2,applyType);//在产车标准预警
-        IPage<EarlyWarningEO> list3 = earlyWarningEOService.newItemsQuery(current3,pageSize3,applyType);//新车条款预警
-        IPage<EarlyWarningEO> list4 = earlyWarningEOService.oldItemsQuery(current4,pageSize4,applyType);//在产车条款预警
+    public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize,
+                                       @RequestParam(defaultValue = "1", value = "oldStandPage")int oldStandPage, @RequestParam(defaultValue = "10", value = "oldStandPageSize") int oldStandPageSize,
+                                       @RequestParam(defaultValue = "1", value = "newItemsPage")int newItemsPage, @RequestParam(defaultValue = "10", value = "newItemsPageSize") int newItemsPageSize,
+                                       @RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,String applyType) {
+        IPage<EarlyWarningEO> list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,applyType);//新车标准预警
+        IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,applyType);//在产车标准预警
+        IPage<EarlyWarningEO> list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,applyType);//新车条款预警
+        IPage<EarlyWarningEO> list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,applyType);//在产车条款预警
         return getResponseMessage(list1, list2, list3, list4);
     }
     private ResponseMessage getResponseMessage(IPage<EarlyWarningEO> list1, IPage<EarlyWarningEO> list2, IPage<EarlyWarningEO> list3, IPage<EarlyWarningEO> list4) {
@@ -60,10 +60,10 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
 
     @GetMapping("/PolicyWarning")
     @ApiOperation("政策预警查询")
-    public ResponseMessage newPolicyPageInfo(@RequestParam(defaultValue = "1", value = "current1")int current1, @RequestParam(defaultValue = "10", value = "pageSize1") int pageSize1,
-                                             @RequestParam(defaultValue = "1", value = "current2")int current2, @RequestParam(defaultValue = "10", value = "pageSize2") int pageSize2) {
-        IPage<EarlyWarningEO> list1 = earlyWarningEOService.newPolicyQuery(current1,pageSize1);
-        IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldPolicyQuery(current2,pageSize2);
+    public ResponseMessage newPolicyPageInfo(@RequestParam(defaultValue = "1", value = "newPolicyPage")int newPolicyPage, @RequestParam(defaultValue = "10", value = "newPolicyPageSize") int newPolicyPageSize,
+                                             @RequestParam(defaultValue = "1", value = "oldPolicyPage")int oldPolicyPage, @RequestParam(defaultValue = "10", value = "oldPolicyPageSize") int oldPolicyPageSize) {
+        IPage<EarlyWarningEO> list1 = earlyWarningEOService.newPolicyQuery(newPolicyPage,newPolicyPageSize);
+        IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldPolicyQuery(oldPolicyPage,oldPolicyPageSize);
         List<Map<String, Object>> listMap = new ArrayList<Map<String,Object>>();
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("newPolicy", list1);