Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518' into dev_jzg_lipf_v20260518

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

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.aop.LogDescriptionField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -72,6 +74,15 @@ public class PtlAgreementCostVo {
     @Schema(description = "审核不通过原因")
     private String reviewDescription;
 
+    @Schema(description = "交强险入口手续费比例")
+    private String jqEntranceFeeRatio;
+
+    @Schema(description = "商业险入口手续费比例")
+    private String syEntranceFeeRatio;
+
+    @Schema(description = "驾意险入口手续费比例")
+    private String jyEntranceFeeRatio;
+
     @Schema(description = "费用类型集合")
     private List<PtlAgreementCostTypeVo> ptlAgreementCostTypeList;
 

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

@@ -21,6 +21,9 @@
         <result column="review_description" property="reviewDescription" jdbcType="VARCHAR"/>
         <result column="agreement_code" property="ptlAgreementCode" jdbcType="VARCHAR"/>
         <result column="agreement_title" property="ptlAgreementName" jdbcType="VARCHAR"/>
+        <result column="jq_entrance_fee_ratio" property="jqEntranceFeeRatio" jdbcType="VARCHAR"/>
+        <result column="sy_entrance_fee_ratio" property="syEntranceFeeRatio" jdbcType="VARCHAR"/>
+        <result column="jy_entrance_fee_ratio" property="jyEntranceFeeRatio" jdbcType="VARCHAR"/>
         <result column="priority_level" property="priorityLevel" jdbcType="INTEGER"/>
         <collection property="ptlAgreementCostTypeList" column="{costId=id}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostTypeVo" select="selectCostType" />
         <collection property="ruleConditions" column="{costId=id}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostRuleVo" select="selectCostRule" />
@@ -220,7 +223,10 @@
             t.audit_time,
             t.priority_level,
             pa.agreement_code,
-            pa.agreement_title
+            pa.agreement_title,
+            pa.jq_entrance_fee_ratio,
+            pa.sy_entrance_fee_ratio,
+            pa.jy_entrance_fee_ratio
         FROM
             ptl_agreement_cost t
             LEFT JOIN ptl_agreement pa ON pa.id = t.ptl_agreement_id