From 1739a3d555a30be28aeafc3a085597eb8f4d9282 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 30 Aug 2021 18:06:47 +0800 Subject: [PATCH] =?UTF-8?q?=20=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6--?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BA=86=E4=BB=A3=E7=A0=81=EF=BC=88=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8F=AA=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=EF=BC=8C=E6=89=80=E4=BB=A5=E4=BC=A0=E7=9A=84string?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=9C=89=E5=BE=88=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=EF=BC=8C=E6=89=80=E4=BB=A5=E4=BC=A0=E4=BA=86=E4=B8=80=E4=B8=AA?= =?UTF-8?q?bean=EF=BC=8C=E6=88=91=E5=B0=B1=E6=8A=8A=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E4=BC=A0=E7=9A=84string=E9=82=A3=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=88=A0=E4=BA=86=EF=BC=89=E5=B8=8C=E6=9C=9B=E4=BA=BA?= =?UTF-8?q?=E6=B2=A1=E4=BA=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 11 +++++----- .../service/EarlyWarningEOService.java | 8 ++++---- .../Impl/EarlyWarningEOServiceImpl.java | 20 ++++--------------- 3 files changed, 13 insertions(+), 26 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 e204002f..c364e76e 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 @@ -37,7 +37,6 @@ public class EarlyWarningEOController extends BaseController { * @param newItemsPageSize * @param oldItemsPage * @param oldItemsPageSize - * @param applyType * @return * @author zj * date 2021-06-15 @@ -47,11 +46,11 @@ public class EarlyWarningEOController extends BaseController { 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,EarlyWarningEO earlyWarningEO) { - IPage list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,applyType,earlyWarningEO);//新车标准预警 - IPage list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,applyType,earlyWarningEO);//在产车标准预警 - IPage list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,applyType,earlyWarningEO);//新车条款预警 - IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,applyType,earlyWarningEO);//在产车条款预警 + @RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,EarlyWarningEO earlyWarningEO) { + IPage list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,earlyWarningEO);//新车标准预警 + IPage list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,earlyWarningEO);//在产车标准预警 + IPage list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,earlyWarningEO);//新车条款预警 + IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警 return getResponseMessage(list1, list2, list3, list4); } private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index 29910fcd..c037a64c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; public interface EarlyWarningEOService extends IService { - IPage newStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); - IPage oldStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); - IPage newItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); - IPage oldItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); + IPage newStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO); + IPage oldStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO); + IPage newItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO); + IPage oldItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO); IPage newPolicyQuery(int current,int pageSize); IPage oldPolicyQuery(int current,int pageSize); String batchSave(List earlyWarningEOS); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 94492cb6..6752ce16 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -39,7 +39,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ + public IPage newStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ @@ -59,14 +59,11 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl oldStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ + public IPage oldStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ @@ -86,14 +83,11 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ + public IPage newItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ @@ -113,14 +107,11 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl oldItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ + public IPage oldItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ @@ -140,9 +131,6 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl