From 2166a0a33fab6ae076018ce1d92dd1f8b8c7c4bd Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 11 Dec 2023 21:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=20=E7=A7=BB=E5=8A=A8=E7=A0=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/OptionalEbomImportChildService.java  | 2 +-
 .../main/resources/mapper/master/OptionalEbomConfigMapper.xml   | 2 +-
 .../resources/mapper/master/OptionalEbomImportChildMapper.xml   | 2 +-
 .../src/main/resources/mapper/master/OptionalEbomMainMapper.xml | 2 +-
 .../main/resources/mapper/master/OptionalMbomMaterialMapper.xml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
index 4b8863dd..04a8a564 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
@@ -138,7 +138,7 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
                 bizErr=item.getMaterialName();
             }
 
-            throw new NflgBusinessException(STATE.BusinessError, "存在相同的数据, "+bizErr);
+            throw new NflgBusinessException(STATE.BusinessError, "存在相同物料, "+bizErr);
         }
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml
index 734856ab..59515c06 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml
@@ -43,7 +43,7 @@
 
 
         <if test="query.startDate!= null and query.startDate!= '' and query.endDate != null and query.endDate!= '' ">
-			<![CDATA[and created_time >= #{query.startDate}  and created_time  <   #{query.endDate} ]]>
+			<![CDATA[and created_time >= #{query.startDate}  and created_time  <=   #{query.endDate} ]]>
             </if>
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildMapper.xml
index 62d33d2a..d6bd7653 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildMapper.xml
@@ -56,7 +56,7 @@ row_id,parent_row_id,root_row_id,material_no,material_name,material_desc,drawing
 
 
         <if test="query.startDate != null and query.startDate != '' and query.endDate != null and query.endDate != ''">
-            <![CDATA[  and created_time >= #{query.startDate} and created_time < #{query.endDate}]]>
+            <![CDATA[  and created_time >= #{query.startDate} and created_time <= #{query.endDate}]]>
         </if>
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
index 9251bb49..60e4a0a7 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
@@ -41,7 +41,7 @@
             </if>
 
             <if test="query.startDate != null and query.startDate != '' and query.endDate != null and query.endDate != ''">
-                <![CDATA[  and created_time >= #{query.startDate} and created_time < #{query.endDate}]]>
+                <![CDATA[  and created_time >= #{query.startDate} and created_time <= #{query.endDate}]]>
             </if>
 
             <if test="query.realName != null and query.realName != ''">
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml
index 4a633be6..0bee0ff1 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml
@@ -72,7 +72,7 @@ row_id,parent_row_id,level_row_id,material_no,material_name,material_desc,drawin
             </if>
 
             <if test="query.startDate != null and query.startDate != '' and query.endDate != null and  query.endDate != null">
-                <![CDATA[  and t1.created_time >= #{query.startDate} and t1.created_time < #{query.endDate}]]>
+                <![CDATA[  and t1.created_time >= #{query.startDate} and t1.created_time <= #{query.endDate}]]>
             </if>