From 98d03d365f40bbbc228d872fc1eef56915ed01b4 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Sat, 7 Oct 2023 17:53:07 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=B7=A5=E4=BD=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aucma/base/domain/BaseProductLine.java    | 29 ++++++++++++++++---
 .../mapper/base/BaseProductLineMapper.xml     | 11 ++++++-
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java
index f6b9ca3..2b3d249 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java
@@ -23,21 +23,27 @@ public class BaseProductLine extends BaseEntity {
     private Long objId;
 
     /**
-     * 产线编号
+     * 产线/工位编号
      */
-    @Excel(name = "产线编号")
+    @Excel(name = "产线/工位编号")
     private String productLineCode;
 
+    /** 父产线/工位名称 */
+    private String parentName;
+
+    /** 父产线/工位编号 */
+    private String parentId;
+
     /**
      * 产线名称
      */
-    @Excel(name = "产线名称")
+    @Excel(name = "产线产线/工位名称")
     private String productLineName;
 
     /**
      * 产线类别（1-产线；2-工位）
      */
-    @Excel(name = "产线类别", readConverterExp = "1=-产线；2-工位")
+    @Excel(name = "类别", readConverterExp = "1=-产线；2-工位")
     private Long productLineType;
 
     /**
@@ -84,6 +90,21 @@ public class BaseProductLine extends BaseEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
 
     public String getPlantName() {
         return plantName;
diff --git a/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml
index e56d82f..27dd64c 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml
@@ -16,6 +16,8 @@
             <result property="createdTime"    column="created_time"    />
             <result property="updatedBy"    column="updated_by"    />
             <result property="updatedTime"    column="updated_time"    />
+            <result property="parentId"    column="parent_id"    />
+            <result property="parentName"    column="parentName"    />
     </resultMap>
 
     <sql id="selectBaseProductLineVo">
@@ -29,9 +31,12 @@
                bpl.created_by,
                bpl.created_time,
                bpl.updated_by,
-               bpl.updated_time
+               bpl.updated_time,
+               bpl.PARENT_ID,
+               b2.PRODUCT_LINE_NAME parentName
         from base_productline bpl
                  left join base_factory bf on bf.factory_code = bpl.plant_code
+                 left join base_productline b2 on b2.PRODUCT_LINE_CODE = bpl.PARENT_ID
     </sql>
 
     <select id="selectBaseProductLineList" parameterType="BaseProductLine" resultMap="BaseProductLineResult">
@@ -46,6 +51,7 @@
                         <if test="createdTime != null "> and bpl.created_time = #{createdTime}</if>
                         <if test="updatedBy != null  and updatedBy != ''"> and bpl.updated_by = #{updatedBy}</if>
                         <if test="updatedTime != null "> and bpl.updated_time = #{updatedTime}</if>
+                        <if test="parentId != null "> and bpl.parent_id = #{parentId}</if>
         </where>
         order by bpl.PRODUCT_LINE_CODE
     </select>
@@ -71,6 +77,7 @@
                 <if test="createdTime != null">created_time,</if>
                 <if test="updatedBy != null">updated_by,</if>
                 <if test="updatedTime != null">updated_time,</if>
+                <if test="parentId != null">parent_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="objId != null">#{objId},</if>
@@ -83,6 +90,7 @@
                 <if test="createdTime != null">#{createdTime},</if>
                 <if test="updatedBy != null">#{updatedBy},</if>
                 <if test="updatedTime != null">#{updatedTime},</if>
+                <if test="parentId != null">#{parentId},</if>
         </trim>
     </insert>
 
@@ -98,6 +106,7 @@
                     <if test="createdTime != null">created_time = #{createdTime},</if>
                     <if test="updatedBy != null">updated_by = #{updatedBy},</if>
                     <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+                    <if test="parentId != null">parent_id = #{parentId},</if>
         </trim>
         where obj_id = #{objId}
     </update>