From 5add5d42155a1b567e045e344a941ca2de993875 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Wed, 6 Dec 2023 23:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewOriginalParentService.java | 4 ++--
 .../bomnew/service/domain/OriginalBom/BaseConvert.java      | 6 +++---
 .../resources/mapper/master/BomNewOriginalParentMapper.xml  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
index 3b48f4ca..5208af32 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
@@ -155,8 +155,8 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
                         child.setStatus(parentEntity.getStatus());
                         child.setDeviseName(parentEntity.getDeviseName());
                         child.setDeviseUserCode(parentEntity.getDeviseUserCode());
-                        child.setCreatedBy(parentEntity.getCreatedBy());
-                        child.setCreatedTime(parentEntity.getCreatedTime());
+                       // child.setCreatedBy(parentEntity.getCreatedBy());
+                       // child.setCreatedTime(parentEntity.getCreatedTime());
                         child.setBomRowId(parentEntity.getRowId());
                         child.setLevelNum(parentEntity.getLevelNum());
                         child.setDeptName(parentEntity.getDeptName());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
index 0f80d0a5..6cddc3a9 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
@@ -125,7 +125,7 @@ public abstract class BaseConvert {
         parentEntity.setDeptName(SessionUtil.getDepartName());
 
         parentEntity.setSource(originalSourceEnum.getValue());
-        parentEntity.setCreatedBy(material.getCreatedBy());
+        parentEntity.setCreatedBy(SessionUtil.getUserCode());
         parentEntity.setCreatedTime(LocalDateTime.now());
 
         if  (StrUtil.isNotBlank(material.getMaterialCategoryCode()) &&(material.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE) || material.getMaterialCategoryCode().startsWith("30") ||
@@ -152,7 +152,7 @@ public abstract class BaseConvert {
         childEntity.setMaterialDesc(material.getMaterialDesc());
         childEntity.setUnitWeight(material.getWeight());
         childEntity.setNum(Convert.toBigDecimal(material.getQty()) );
-        childEntity.setCreatedBy(parent.getCreatedBy());
+        childEntity.setCreatedBy(SessionUtil.getUserCode());
         this.resultChild.add(childEntity);
         return childEntity;
 
@@ -175,7 +175,7 @@ public abstract class BaseConvert {
         childEntity.setMaterialDesc(material.getMaterialDesc());
         childEntity.setUnitWeight(parent.getUnitWeight());
         childEntity.setNum(parent.getUnitWeight());
-
+        childEntity.setCreatedBy(SessionUtil.getUserCode());
         this.resultChild.add(childEntity);
         return childEntity;
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
index d6111330..d8ca5462 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
@@ -61,7 +61,7 @@
             </foreach>
         </if>
         <if test="query.startDate!=null and query.startDate!=''">
-            and created_time between #{query.startDate} and #{query.endDate}
+            and created_time between #{query.startDate} and DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
         </if>
     </sql>