修改bug：

jyx_config增加parent_product_code字段，用于解决国任报价时获取goodsCode获取不到的问题

commons/src/main/java/com/jzg/commons/entity/dto/JyxConfigAdd.java

@@ -55,6 +55,12 @@ public class JyxConfigAdd {
     @Schema(description = "附加Code")
     private String riskCode;
 
+    /**
+     * 父产品编码
+     */
+    @Schema(description = "父产品编码")
+    private String parentProductCode;
+
 
     @Schema(description = "保险责任")
     //@NotEmpty(message = "保险责任不能为空")

commons/src/main/java/com/jzg/commons/entity/dto/JyxConfigEnd.java

@@ -63,6 +63,12 @@ public class JyxConfigEnd {
     @Schema(description = "附加Code")
     private String riskCode;
 
+    /**
+     * 父产品编码
+     */
+    @Schema(description = "父产品编码")
+    private String parentProductCode;
+
     @Schema(description = "保险责任")
     private List<JyxBlame> blameList;
 

commons/src/main/java/com/jzg/commons/entity/po/JyxConfig.java

@@ -43,4 +43,9 @@ public class JyxConfig extends BaseModel {
      */
     private String riskCode;
 
+    /**
+     * 父产品编码
+     */
+    private String parentProductCode;
+
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/AccidentalDrivingVo.java

@@ -41,6 +41,11 @@ public class AccidentalDrivingVo implements Serializable {
      */
     @Schema(description = "产品编码")
     private String productCode;
+    /**
+     * 父产品编码
+     */
+    @Schema(description = "父产品编码")
+    private String parentProductCode;
     /**
      * 产品名称
      */

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

@@ -92,6 +92,8 @@ public class SchemeResultVo {
         private String id;
         private String productName;
         private String productCode;
+        private String riskCode;
+        private String parentProductCode;
         private String alias;
         private String coverage;
         private String premium;

commons/src/main/java/com/jzg/commons/entity/vo/JyxConfigVo.java

@@ -47,6 +47,12 @@ public class JyxConfigVo {
     @Schema(description = "附加Code")
     private String riskCode;
 
+    /**
+     * 父产品编码
+     */
+    @Schema(description = "父产品编码")
+    private String parentProductCode;
+
     @Schema(description = "总保额")
     private  String coverage;
 

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/service/Impl/GuoRenApiRequestImpl.java

@@ -514,7 +514,7 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
             guoRenAccidentalDrivingVo.setRiskCode(accidentalDrivingVo.getRiskCode());
             guoRenAccidentalDrivingVo.setQuantity(accidentalDrivingVo.getQuantity());
             guoRenAccidentalDrivingVo.setProdCode(accidentalDrivingVo.getProductCode());
-            guoRenAccidentalDrivingVo.setGoodsCode(accidentalDrivingVo.getRiskCode());
+            guoRenAccidentalDrivingVo.setGoodsCode(accidentalDrivingVo.getParentProductCode());
             guoRenAccidentalDrivingVo.setGoodsName(accidentalDrivingVo.getProductCategoryName());
         }
         return guoRenAccidentalDrivingVo;

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

@@ -39,6 +39,8 @@
                 <id column="jc_id" property="id"/>
                 <result column="product_name" property="productName"/>
                 <result column="product_code" property="productCode"/>
+                <result column="risk_code" property="riskCode"/>
+                <result column="parent_product_code" property="parentProductCode"/>
                 <result column="alias" property="alias"/>
                 <result column="grouping" property="grouping"/>
                 <result column="premium" property="premium"/>
@@ -155,6 +157,8 @@
             jc.product_code,
             jc.coverage,
             jc.premium,
+            jc.risk_code,
+            jc.parent_product_code,
             psidi.quantity,
             psidi.selected_status
         FROM