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 680b2b53..e241936c 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
@@ -41,33 +41,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
     @Override
     public IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){
         QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
-        //根据标准编号查询
-        if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){
-            wrapper.like("STAND_CODE",earlyWarningEO.getStandCode());
-        }
-        //根据标准名称查询
-        if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){
-            wrapper.like("STAND_NAME",earlyWarningEO.getStandName());
-        }
-        //根据实施日期查询
-        if (earlyWarningEO.getPutTime() != null ){
-            SimpleDateFormat formater = new SimpleDateFormat();
-            formater.applyPattern("yyyy-MM-dd");
-            if (earlyWarningEO.getLastTime() != null){
-                wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime()));
-            }else {
-                wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime()));
-            }
-        }
-        if (earlyWarningEO.getLastTime()!=null){
-            SimpleDateFormat formater = new SimpleDateFormat();
-            formater.applyPattern("yyyy-MM-dd");
-            wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime()));
-        }
-        //根据适用车型查询
-        if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
-            wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType());
-        }
+        selectMethods(earlyWarningEO, wrapper);
         wrapper.eq("mark",1);
         return getEarlyWarningEOIPage(current, pageSize, wrapper);
     }
@@ -75,32 +49,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
     public IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){
         QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
         //根据标准编号查询
-        if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){
-            wrapper.like("STAND_CODE",earlyWarningEO.getStandCode());
-        }
-        //根据标准名称查询
-        if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){
-            wrapper.like("STAND_NAME",earlyWarningEO.getStandName());
-        }
-        //根据实施日期查询
-        if (earlyWarningEO.getPutTime() != null ){
-            SimpleDateFormat formater = new SimpleDateFormat();
-            formater.applyPattern("yyyy-MM-dd");
-            if (earlyWarningEO.getLastTime() != null){
-                wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime()));
-            }else {
-                wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime()));
-            }
-        }
-        if (earlyWarningEO.getLastTime()!=null){
-            SimpleDateFormat formater = new SimpleDateFormat();
-            formater.applyPattern("yyyy-MM-dd");
-            wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime()));
-        }
-        //根据适用车型查询
-        if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
-            wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType());
-        }
+        selectMethods(earlyWarningEO, wrapper);
         wrapper.eq("mark",2);
         return getEarlyWarningEOIPage(current, pageSize, wrapper);
     }
@@ -108,32 +57,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
     public IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){
         QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
         //根据标准编号查询
-        if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){
-            wrapper.like("STAND_CODE",earlyWarningEO.getStandCode());
-        }
-        //根据标准名称查询
-        if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){
-            wrapper.like("STAND_NAME",earlyWarningEO.getStandName());
-        }
-        //根据实施日期查询
-        if (earlyWarningEO.getPutTime() != null ){
-            SimpleDateFormat formater = new SimpleDateFormat();
-            formater.applyPattern("yyyy-MM-dd");
-            if (earlyWarningEO.getLastTime() != null){
-                wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime()));
-            }else {
-                wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime()));
-            }
-        }
-        if (earlyWarningEO.getLastTime()!=null){
-            SimpleDateFormat formater = new SimpleDateFormat();
-            formater.applyPattern("yyyy-MM-dd");
-            wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime()));
-        }
-        //根据适用车型查询
-        if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
-            wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType());
-        }
+        selectMethods(earlyWarningEO, wrapper);
         wrapper.eq("mark",3);
         return getEarlyWarningEOIPage(current, pageSize, wrapper);
     }
@@ -141,32 +65,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
     public IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){
         QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
         //根据标准编号查询
-        if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){
-            wrapper.like("STAND_CODE",earlyWarningEO.getStandCode());
-        }
-        //根据标准名称查询
-        if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){
-            wrapper.like("STAND_NAME",earlyWarningEO.getStandName());
-        }
-        //根据实施日期查询
-        if (earlyWarningEO.getPutTime() != null ){
-            SimpleDateFormat formater = new SimpleDateFormat();
-            formater.applyPattern("yyyy-MM-dd");
-            if (earlyWarningEO.getLastTime() != null){
-                wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime()));
-            }else {
-                wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime()));
-            }
-        }
-        if (earlyWarningEO.getLastTime()!=null){
-            SimpleDateFormat formater = new SimpleDateFormat();
-            formater.applyPattern("yyyy-MM-dd");
-            wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime()));
-        }
-        //根据适用车型查询
-        if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
-            wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType());
-        }
+        selectMethods(earlyWarningEO, wrapper);
         wrapper.eq("mark",4);
         return getEarlyWarningEOIPage(current, pageSize, wrapper);
     }
@@ -215,4 +114,34 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         System.out.println("总页数"+userIPage.getPages());
         return userIPage;
     }
+
+    private void selectMethods(EarlyWarningEO earlyWarningEO, QueryWrapper<EarlyWarningEO> wrapper) {
+        //根据标准编号查询
+        if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0) {
+            wrapper.like("STAND_CODE", earlyWarningEO.getStandCode());
+        }
+        //根据标准名称查询
+        if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0) {
+            wrapper.like("STAND_NAME", earlyWarningEO.getStandName());
+        }
+        //根据实施日期查询
+        if (earlyWarningEO.getPutTime() != null) {
+            SimpleDateFormat formater = new SimpleDateFormat();
+            formater.applyPattern("yyyy-MM-dd");
+            if (earlyWarningEO.getLastTime() != null) {
+                wrapper.between("PUT_TIME", formater.format(earlyWarningEO.getPutTime()), formater.format(earlyWarningEO.getLastTime()));
+            } else {
+                wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime()));
+            }
+        }
+        if (earlyWarningEO.getLastTime() != null) {
+            SimpleDateFormat formater = new SimpleDateFormat();
+            formater.applyPattern("yyyy-MM-dd");
+            wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime()));
+        }
+        //根据适用车型查询
+        if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0) {
+            wrapper.like("APPLY_TYPE", earlyWarningEO.getApplyType());
+        }
+    }
 }