From 7e6ee28c2e047000cdf23e9c61afc111badb2f2c Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 22 Nov 2021 09:26:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/EarlyWarningEO.java                |  3 ++
 .../Impl/EarlyWarningEOServiceImpl.java       | 44 +++++++++++++++++--
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
index dab9f160..20aeca75 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
@@ -42,6 +42,9 @@ public class EarlyWarningEO extends BaseEntity {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date putTime;
 
+    @TableField(exist = false)
+    private Date lastTime;
+
     @TableField("APPLY_TYPE")
     private String applyType;
 
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 66136d5c..680b2b53 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
@@ -53,7 +53,16 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         if (earlyWarningEO.getPutTime() != null ){
             SimpleDateFormat formater = new SimpleDateFormat();
             formater.applyPattern("yyyy-MM-dd");
-            wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
+            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){
@@ -77,7 +86,16 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         if (earlyWarningEO.getPutTime() != null ){
             SimpleDateFormat formater = new SimpleDateFormat();
             formater.applyPattern("yyyy-MM-dd");
-            wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
+            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){
@@ -101,7 +119,16 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         if (earlyWarningEO.getPutTime() != null ){
             SimpleDateFormat formater = new SimpleDateFormat();
             formater.applyPattern("yyyy-MM-dd");
-            wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
+            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){
@@ -125,7 +152,16 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         if (earlyWarningEO.getPutTime() != null ){
             SimpleDateFormat formater = new SimpleDateFormat();
             formater.applyPattern("yyyy-MM-dd");
-            wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
+            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){