From 661870ce6dd751aff4df022668a35bef4f6da8b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Thu, 2 Apr 2026 09:14:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(quotation):=20=E6=B7=BB=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=9E=8B=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ModelConfigItemLanguageVO 中新增 itemParentType 字段用于标识上级类别
- 修改 getVOListByConfigId 查询方法，从父级配置项表关联查询类型信息
- 更新 SQL 映射文件，添加 LEFT JOIN 子句关联父级配置项获取类型数据
- 扩展查询结果集，将父级类别类型映射到 item_parent_type 字段
- 完善配置项数据结构，支持可选配置和标准配置的类型区分
---
 .../common/pojo/vo/quotation/ModelConfigItemLanguageVO.java  | 5 +++++
 .../main/resources/mapper/QuotationModelConfigItemMapper.xml | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/quotation/ModelConfigItemLanguageVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/quotation/ModelConfigItemLanguageVO.java
index 89f0189a..d1f48db4 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/quotation/ModelConfigItemLanguageVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/quotation/ModelConfigItemLanguageVO.java
@@ -19,6 +19,11 @@ public class ModelConfigItemLanguageVO {
      */
     private Long itemParentId;
 
+    /**
+     * 上级类别，0：可选配置；1：标准配置
+     */
+    private Integer itemParentType;
+
     /**
      * 项id
      */
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigItemMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigItemMapper.xml
index 1d1e4ed6..2ff33818 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigItemMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/QuotationModelConfigItemMapper.xml
@@ -3,11 +3,12 @@
 <mapper namespace="com.nflg.mobilebroken.repository.mapper.QuotationModelConfigItemMapper">
 
     <select id="getVOListByConfigId" resultType="com.nflg.mobilebroken.common.pojo.vo.quotation.ModelConfigItemLanguageVO">
-        SELECT mcil.id,mci.parent_id as 'item_parent_id',mci.id as 'item_id',mcil.part_name,mcil.part_remark
-                      ,mcil.create_by,mcil.create_time,mcil.update_by,mcil.update_time,mci.*
+        SELECT mcil.id,mci.parent_id as 'item_parent_id',mcip.type as 'item_parent_type',mci.id as 'item_id'
+            ,mcil.part_name,mcil.part_remark,mcil.create_by,mcil.create_time,mcil.update_by,mcil.update_time,mci.*
         FROM quotation_model_config_item mci
         INNER JOIN quotation_model_config_item_language mcil ON mci.id=mcil.config_item_id
         INNER JOIN `language` l ON l.id=mcil.language_id
+        LEFT JOIN quotation_model_config_item mcip ON mci.parent_id=mcip.id
         WHERE mci.config_id=#{configId} AND l.code=#{languageCode}
     </select>
 </mapper>