From e4e733d61fa0b4e63595567aa69687f83ba28e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Fri, 1 Dec 2023 18:56:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E5=A7=8BBOM=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/domain/OriginalBom/BaseConvert.java | 2 +- .../main/resources/mapper/master/BomNewOriginalParentMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3a8f3464..b5e3d61e 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 @@ -118,7 +118,7 @@ public abstract class BaseConvert { parentEntity.setMaterialTexture(material.getMaterial()); parentEntity.setUnitWeight(material.getWeight()); parentEntity.setDeviseUserCode(material.getDesignBy()); - parentEntity.setDeviseName(SessionUtil.getUserName()); + parentEntity.setDeviseName(SessionUtil.getRealName()); parentEntity.setStatus(OriginalStatusEnum.UN_CONVERT.getValue()); parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_CREATED.getValue()); parentEntity.setDeptRowId(SessionUtil.getPartRowId()); 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 f2baa35a..cde1f338 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 @@ - and created_time between #{query.startDate} and #{query.startDate} + and created_time between #{query.startDate} and #{query.endDate}