From fa51e7dacd8dfe5c9f312f9ffef922dddebea639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 29 Apr 2024 09:35:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20ebom=E5=B7=A5=E4=BD=9C=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=88=97=E8=A1=A8=E5=92=8C=E6=AD=A3=E5=BC=8F=E8=A1=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=B9=E2=80=9C=E5=8F=AA=E6=98=BE=E7=A4=BA=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1=E2=80=9D=E6=95=B0=E6=8D=AE=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/pojo/query/BomNewEbomParentQuery.java  | 12 +++++-------
 .../mapper/master/BomNewEbomParentMapper.xml      | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
index 5aaa042f..a085a7e9 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
@@ -6,8 +6,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * t_bom_new_ebom_parent 
@@ -33,8 +31,6 @@ public class BomNewEbomParentQuery  extends BasePageQuery implements Serializabl
     @ApiModelProperty(value = "物料编码")
     private String materialNo;
         
-
-        
     /**
     * 设计人员名称
     */
@@ -50,9 +46,11 @@ public class BomNewEbomParentQuery  extends BasePageQuery implements Serializabl
     @ApiModelProperty("数据类型 0-EBOM工作列表数据   1-EBOM正式工作表明细  2-变更影响")
     private Integer dataType=0;
 
+    /*
+     * 是否仅显示自己的数据：0=所有人的数据；1=仅自己的数据，默认为0
+     */
+    @ApiModelProperty(value = "是否仅显示自己的数据：0=所有人的数据；1=仅自己的数据，默认为0")
+    private Integer showMySelfOnly = 0;
 
-    
-
-    
     private static final long serialVersionUID = 1L;
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index b3043205..e391f8da 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -187,11 +187,19 @@
 
     <!--BOM-正式工作表-->
     <select id="formalWorksheet" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">
-        select * , row_id as bomRowId from t_bom_new_ebom_parent a
+        select * , row_id as bomRowId
+        from t_bom_new_ebom_parent a
         join (select material_no, max(current_version) current_version from t_bom_new_ebom_parent
-        where status=4   <include refid="whr"/>
+        where status=4
+        <if test="query.showMySelfOnly == 1">
+            AND created_by = #{userCode}
+        </if>
+        <include refid="whr"/>
         group by material_no) b on a.material_no=b.material_no and a.current_version=b.current_version
         where a.status=4
+        <if test="query.showMySelfOnly == 1">
+            AND a.created_by = #{userCode}
+        </if>
     </select>
 
     <sql id="getUpgradeChangeListWhr">
@@ -385,6 +393,9 @@
         SELECT *,row_id as bomRowId
         FROM t_bom_new_ebom_parent
         <!--        WHERE (root_is=1 OR ((user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode}))-->
+        <if test="query.showMySelfOnly == 1">
+            AND created_by = #{userCode}
+        </if>
         <if test="userJob==0">
             WHERE status IN (1,3) AND (user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode}
         </if>