From e8f7ef564d5f8bc8b8572b150225eeeff3ba57b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 22 Jan 2024 08:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5sap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/entity/BomNewPbomParentEntity.java    | 18 ++++++++++++++++++
 .../service/BomNewPbomParentService.java       |  2 ++
 .../mapper/master/BomNewPbomParentMapper.xml   |  4 +++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java
index c7ed189c..24b1f754 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java
@@ -266,6 +266,24 @@ public class BomNewPbomParentEntity implements Serializable {
     @ApiModelProperty(value = "发布人")
     private String releaseUserName;
 
+
+    /**
+     * 最后一次转MbOM人员
+     */
+    @TableField(value = "last_convert_mbom_user_name")
+    @ApiModelProperty(value = "最后一次转MbOM人员")
+    private String lastConvertMbomUserName;
+
+
+    /**
+     * 最后一次转Mbom时间
+     */
+    @TableField(value = "last_convert_mbom_time")
+    @ApiModelProperty(value = "最后一次转Mbom时间")
+    private LocalDateTime lastConvertMbomTime;
+
+
+
     /**
      * 版本过期时间=下个版本的创建时间
      */
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 66948abc..8c34856f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -742,6 +742,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         List<Long> bomRowIds = allChild.stream().filter(u -> u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
 
         rootParent.setStatus(PBomStatusEnum.PUBLISH.getValue());
+        rootParent.setLastConvertMbomUserName(SessionUtil.getRealName());
+        rootParent.setLastConvertMbomTime(LocalDateTime.now());
         this.updateById(rootParent);
         if (CollUtil.isNotEmpty(bomRowIds)) {
             this.getBaseMapper().toMBom(PBomStatusEnum.PUBLISH.getValue(), SessionUtil.getRealName(), bomRowIds);
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 fbacd012..92b2ee65 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
@@ -38,6 +38,8 @@
         <result column="created_job" property="createdJob" jdbcType="INTEGER"/>
         <result column="release_time" property="releaseTime" jdbcType="TIMESTAMP"/>
         <result column="release_user_name" property="releaseUserName" jdbcType="VARCHAR"/>
+        <result column="last_convert_mbom_user_name" property="lastConvertMbomUserName" jdbcType="VARCHAR"/>
+        <result column="last_convert_mbom_time" property="lastConvertMbomTime" jdbcType="TIMESTAMP" />
         <result column="expire_end_time" property="expireEndTime" jdbcType="TIMESTAMP"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="dept_name" property="deptName" jdbcType="VARCHAR"/>
@@ -54,7 +56,7 @@
         material_texture, material_unit, unit_weight, total_weight, current_version, num, project_type, root_is,
         should_bom_exist, super_material_status, bom_exist, last_version_is, edit_status, status, user_root_is,
         virtual_package_is, source_row_id, devise_user_code, devise_name,technology_user_code,technology_user_name, created_by, created_time, created_job,
-        release_time, release_user_name, expire_end_time, remark, dept_name, level_num, change_desc, notice_nums,
+        release_time, release_user_name,last_convert_mbom_user_name,last_convert_mbom_time, expire_end_time, remark, dept_name, level_num, change_desc, notice_nums,
         order_no, modify_time
     </sql>