方案处理驾意险

commons/src/main/java/com/jzg/commons/entity/scheme/vo/SchemeResultVo.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.scheme.vo;
 
+import com.jzg.commons.entity.po.jyxSetting;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -107,6 +108,7 @@ public class SchemeResultVo {
          * 产品分类编码
          */
         private String productCategoryName;
+        private String premiumSetting;
         private String alias;
         private String coverage;
         private String sumAmount;
@@ -115,5 +117,7 @@ public class SchemeResultVo {
         private String selectedStatus;
         private Integer minSeatCount;
         private Integer maxSeatCount;
+
+        List<jyxSetting> settingList;
     }
 }

tenant/organization/src/main/resources/mapper/PtlSchemeMapper.xml

@@ -49,12 +49,22 @@
                 <result column="parent_product_name" property="parentProductName"/>
                 <result column="product_category_code" property="productCategoryCode"/>
                 <result column="product_category_name" property="productCategoryName"/>
+                <result column="premium_setting" property="premiumSetting"/>
                 <result column="alias" property="alias"/>
                 <result column="premium" property="premium"/>
                 <result column="quantity" property="quantity"/>
                 <result column="selected_status" property="selectedStatus"/>
                 <result column="min_seat_count" property="minSeatCount"/>
                 <result column="max_seat_count" property="maxSeatCount"/>
+                <collection property="settingList" ofType="com.jzg.commons.entity.po.jyxSetting">
+                    <id column="setting_id" property="id"/>
+                    <result column="seats" property="seats"/>
+                    <result column="setting_coverage" property="coverage"/>
+                    <result column="setting_premium" property="premium"/>
+                    <result column="setting_system_code" property="systemCode"/>
+                    <result column="setting_jyx_config_id" property="jyxConfigId"/>
+                    <result column="setting_product_code" property="productCode"/>
+                </collection>
             </collection>
         </collection>
     </resultMap>
@@ -175,16 +185,22 @@
             jc1.product_name as parent_product_name,
             jc1.product_code as product_category_code,
             jc1.product_name as product_category_name,
+            jc.premium_setting,
             psidi.quantity,
             psidi.selected_status,
             psidi.min_seat_count,
-            psidi.max_seat_count
+            psidi.max_seat_count,
+            js.id as setting_id,
+            js.seats,
+            js.premium as setting_premium,
+            js.product_code as setting_product_code
         FROM
             ptl_scheme ps
                 left JOIN ptl_scheme_info psi ON ps.id = psi.scheme_id AND psi.is_delete = 0
                 left JOIN ptl_scheme_insurance_driving_intention psidi ON psidi.scheme_info_id = psi.id AND psidi.is_delete = 0
                 left JOIN jyx_config jc ON psidi.driving_intention_id = jc.id AND jc.is_delete = 0
                 left JOIN jyx_config jc1 on jc.parent_id = jc1.id AND jc1.is_delete = 0
+                left join  jyx_setting js on js.jyx_config_id = jc.id
         WHERE
             ps.company_id = #{companyId}
           AND ps.product_id = #{productId}