From f030e56db58a1b61a5f6b6910f8842dc71c4df16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 19 Jun 2024 16:31:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(pbom):=20=E4=BF=AE=E5=A4=8Dpbom=E6=AD=A3?=
 =?UTF-8?q?=E5=BC=8F=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=97=B6=E9=97=B4=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/master/BomNewPbomParentMapper.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
index 93a0d0e7..0230f50f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
@@ -118,8 +118,14 @@
         <if test=" (query.materialNo== null || query.materialNo=='' ) and (query.drawingNo== null || query.drawingNo=='')">
             and root_is=1
         </if>
-        <if test="query.startDate== null">
-            and release_time  > DATE_SUB(release_time, INTERVAL 4 DAY)
+        <if test="(query.startDate==null || query.startDate=='') and (query.endDate==null || query.endDate=='')">
+            and release_time > DATE_SUB(release_time, INTERVAL 3 DAY)
+        </if>
+        <if test="query.startDate!=null and query.startDate!=''">
+            AND release_time >= #{query.startDate}
+        </if>
+        <if test="query.endDate!=null and query.endDate!=''">
+            AND release_time &lt; DATE_SUB(#{query.endDate}, INTERVAL -1 DAY)
         </if>
         <if test="query.facCode!= null and query.facCode!=''">
             and fac_code = #{query.facCode}