From bdb726400f27c2ac9145d89d29e483b029b84727 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Sat, 6 Jan 2024 21:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=20=E9=80=80=E5=9B=9E=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/pojo/vo/BomNewMbomMiddleVO.java    |  2 +-
 .../mapper/master/BomNewMbomParentMapper.xml  | 33 +++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java
index 7be75fe2..2d0616ce 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java
@@ -228,7 +228,7 @@ public class BomNewMbomMiddleVO extends BaseMaterialVO implements Serializable {
     }
 
     @ApiModelProperty(value = "状态 0-待处理  1-已处理 2- 驳回")
-    private Integer backStatus;
+    private Integer backStatus=0;
 
     private List<BomNewMbomMiddleVO> childNodes = Collections.emptyList();
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
index 69354c1e..b08108e4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
@@ -105,8 +105,12 @@
 <!--    </select>-->
 
     <select id="getParentChild" resultType="com.nflg.product.bomnew.pojo.vo.BomNewMbomMiddleVO">
-        select  t1.*,(SELECT count(1) from t_bom_new_mbom_detail where parent_row_id=t1.row_id) as bom_exist
+        select  t1.*,IFNULL(t2.back_status,0) as back_status,
+
+                (SELECT count(1) from t_bom_new_mbom_detail where parent_row_id=t1.row_id) as bom_exist
         from t_bom_new_mbom_detail as  t1
+                 left join t_bom_new_mbom_back_material as t2
+                           on t1.row_id=t2.detail_row_id
         where t1.parent_row_id = #{rowId}
         order by t1.order_number
     </select>
@@ -142,18 +146,21 @@
 
     <select id="searchList" resultType="com.nflg.product.bomnew.pojo.vo.BomNewMbomMiddleVO">
         <![CDATA[
-     SELECT t2.*,(SELECT count(1) from t_bom_new_mbom_detail where parent_row_id=t2.row_id) as bom_exist
-        FROM
-        (
-        SELECT
-        @r AS _row_id,
-        (SELECT @r := parent_row_id FROM t_bom_new_mbom_detail WHERE row_id = _row_id) AS parent_row_id
-        FROM
-        (SELECT @r := #{rowId}) vars, t_bom_new_mbom_detail AS h
-        WHERE @r <> 0
-        ) t1
-        JOIN t_bom_new_mbom_detail t2
-        ON t1._row_id = t2.row_id
+        select T1.*, IFNULL(T2.back_status, 0) as back_status
+        from (SELECT t2.*, (SELECT count(1) from t_bom_new_mbom_detail where parent_row_id = t2.row_id) as bom_exist
+              FROM (SELECT @r AS _row_id,
+                           (SELECT @r := parent_row_id
+                    FROM t_bom_new_mbom_detail
+                    WHERE row_id = _row_id) AS parent_row_id
+                  FROM
+        (SELECT @r := #{rowId}) vars
+                 , t_bom_new_mbom_detail AS h
+              WHERE @r <> 0) t1
+                 JOIN t_bom_new_mbom_detail t2
+                      ON t1._row_id = t2.row_id
+                      )as T1
+         left join t_bom_new_mbom_back_material as T2
+        on T1.row_id=T2.detail_row_id
         ]]>
     </select>