From a1c31f87a3cbf2d74b73623b6bce12a59f3ba00d Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Thu, 16 Nov 2023 10:27:14 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=B4=A8=E6=A3=80=E9=A1=B9?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/BaseQualityInspectionItem.java     | 14 +++++
 .../base/BaseQualityInspectionItemMapper.xml  | 59 ++++++++++---------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java
index 5df4917..87529e6 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java
@@ -56,6 +56,12 @@ public class BaseQualityInspectionItem extends BaseEntity {
     @Excel(name = "工位编号")
     private String stationCode;
 
+    /**
+     * 工位名称
+     */
+    @Excel(name = "工位名称")
+    private String stationName;
+
     /**
      * 启用标识
      */
@@ -88,6 +94,14 @@ public class BaseQualityInspectionItem extends BaseEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
     public void setObjId(Long objId) {
         this.objId = objId;
     }
diff --git a/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
index a3b8146..a7b2d55 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
@@ -12,6 +12,7 @@
         <result property="materialCategories" column="material_categories"/>
         <result property="materialSubclass" column="material_subclass"/>
         <result property="stationCode" column="station_code"/>
+        <result property="stationName" column="station_name"/>
         <result property="remark" column="remark"/>
         <result property="isFlag" column="is_flag"/>
         <result property="createdBy" column="created_by"/>
@@ -21,45 +22,47 @@
     </resultMap>
 
     <sql id="selectBaseQualityInspectionItemVo">
-        select obj_id,
-               quality_defect_code,
-               quality_defect_name,
-               parent_id,
-               material_categories,
-               material_subclass,
-               station_code,
-               remark,
-               is_flag,
-               created_by,
-               created_time,
-               updated_by,
-               updated_time
-        from base_quality_inspection_item
+        select qi.obj_id,
+               qi.quality_defect_code,
+               qi.quality_defect_name,
+               qi.parent_id,
+               qi.material_categories,
+               qi.material_subclass,
+               qi.station_code,
+               pl.PRODUCT_LINE_NAME station_name,
+               qi.remark,
+               qi.is_flag,
+               qi.created_by,
+               qi.created_time,
+               qi.updated_by,
+               qi.updated_time
+        from base_quality_inspection_item qi
+                 left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE = qi.STATION_CODE
     </sql>
 
     <select id="selectBaseQualityInspectionItemList" parameterType="BaseQualityInspectionItem"
             resultMap="BaseQualityInspectionItemResult">
         <include refid="selectBaseQualityInspectionItemVo"/>
         <where>
-            <if test="qualityDefectCode != null  and qualityDefectCode != ''">and quality_defect_code =
+            <if test="qualityDefectCode != null  and qualityDefectCode != ''">and qi.quality_defect_code =
                 #{qualityDefectCode}
             </if>
-            <if test="qualityDefectName != null  and qualityDefectName != ''">and quality_defect_name like
+            <if test="qualityDefectName != null  and qualityDefectName != ''">and qi.quality_defect_name like
                 concat(concat('%', #{qualityDefectName}), '%')
             </if>
-            <if test="parentId != null  and parentId != ''">and parent_id = #{parentId}</if>
-            <if test="materialCategories != null  and materialCategories != ''">and material_categories =
+            <if test="parentId != null  and parentId != ''">and qi.parent_id = #{parentId}</if>
+            <if test="materialCategories != null  and materialCategories != ''">and qi.material_categories =
                 #{materialCategories}
             </if>
-            <if test="materialSubclass != null  and materialSubclass != ''">and material_subclass =
+            <if test="materialSubclass != null  and materialSubclass != ''">and qi.material_subclass =
                 #{materialSubclass}
             </if>
-            <if test="stationCode != null  and stationCode != ''">and station_code = #{stationCode}</if>
-            <if test="isFlag != null ">and is_flag = #{isFlag}</if>
-            <if test="createdBy != null  and createdBy != ''">and created_by = #{createdBy}</if>
-            <if test="createdTime != null ">and created_time = #{createdTime}</if>
-            <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
-            <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
+            <if test="stationCode != null  and stationCode != ''">and qi.station_code = #{stationCode}</if>
+            <if test="isFlag != null ">and qi.is_flag = #{isFlag}</if>
+            <if test="createdBy != null  and createdBy != ''">and qi.created_by = #{createdBy}</if>
+            <if test="createdTime != null ">and qi.created_time = #{createdTime}</if>
+            <if test="updatedBy != null  and updatedBy != ''">and qi.updated_by = #{updatedBy}</if>
+            <if test="updatedTime != null ">and qi.updated_time = #{updatedTime}</if>
         </where>
         order by quality_defect_code
     </select>
@@ -67,12 +70,12 @@
     <select id="selectBaseQualityInspectionItemByObjId" parameterType="Long"
             resultMap="BaseQualityInspectionItemResult">
         <include refid="selectBaseQualityInspectionItemVo"/>
-        where obj_id = #{objId}
+        where qi.obj_id = #{objId}
     </select>
     <select id="selectBaseQualityInspectionItemParent" resultMap="BaseQualityInspectionItemResult">
         <include refid="selectBaseQualityInspectionItemVo"/>
-        where PARENT_ID = 0
-        order by quality_defect_code
+        where qi.PARENT_ID = 0
+        order by qi.quality_defect_code
     </select>
     <select id="getQualityDefects" parameterType="String" resultMap="BaseQualityInspectionItemResult">
         select bq2.obj_id,