From 4a1c6c00d6f3e911ce2b61f5d9b2d6ad6935ba1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Thu, 16 May 2024 10:58:33 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BB=8ECAD=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/mapper/master/BomNewOriginalChildMapper.java | 2 ++ .../bomnew/pojo/entity/BomOriginalCadChildEntity.java | 4 ++-- .../domain/OriginalBom/PlmBomToOriginalConvertV2.java | 2 +- .../resources/mapper/master/BomNewOriginalChildMapper.xml | 7 +++++++ .../nflg/product/base/core/conmon/util/SessionUtil.java | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalChildMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalChildMapper.java index ff00ace2..d2c792f7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalChildMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalChildMapper.java @@ -40,4 +40,6 @@ public interface BomNewOriginalChildMapper extends BaseMapper rowIds); + + void deleteChildByParentRowIds(@Param("parentRowIds") List parentRowIds); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomOriginalCadChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomOriginalCadChildEntity.java index 966cf16e..6222d4bb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomOriginalCadChildEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomOriginalCadChildEntity.java @@ -101,9 +101,9 @@ public class BomOriginalCadChildEntity implements Serializable { /** * 项目类别 */ - @TableField(value = "projectType") + @TableField(value = "project_type") @ApiModelProperty(value = "项目类别") - private String project_type; + private String projectType; /** * diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java index 5610c468..ec51e746 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java @@ -99,7 +99,7 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert { originalParentService.getBaseMapper().deleteByMap(ImmutableMap.of("drawing_no", parent.getChartNo())); List oldParentRowIds = oldOriginalParents.stream().map(u -> u.getRowId()).collect(Collectors.toList()); if (CollUtil.isNotEmpty(oldParentRowIds)) { - originalChildService.getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldOriginalParents)); + originalChildService.getBaseMapper().deleteChildByParentRowIds(oldParentRowIds); } //有子级(原始BOM-直接覆盖) if (CollUtil.isNotEmpty(childs)) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml index af3dd708..edd7986b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml @@ -86,4 +86,11 @@ #{rowId} ; + + + delete from t_bom_new_original_child where parent_row_id in + + #{rowId} + + diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java index e833f0bb..b60092de 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java @@ -33,7 +33,7 @@ public class SessionUtil { */ public static String getUserCode() { //return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QHI17062100"); - return getUser().getUserCode(); + return "NFLG20231201"; }