Merge remote-tracking branch 'origin/master'

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

@@ -44,6 +44,10 @@ public class AgreementVo extends BaseModel {
     @Schema(description = "关联-保险公司id")
     private String companyId;
 
+    /** 合作-保险公司id */
+    @Schema(description = "合作-保险公司id")
+    private String partnerCompanyId;
+
     /** 协议起期 */
     @Schema(description = "协议起期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -162,6 +166,10 @@ public class AgreementVo extends BaseModel {
     @Schema(description = "关联-保险公司简称")
     private String company;
 
+    /** 关联-保险公司简称 */
+    @Schema(description = "关联-保险公司简称")
+    private String partnerCompanyName;
+
     @Schema(description = "交强入口手续费比例")
     private BigDecimal jqEntranceFeeRatio;
 

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

@@ -13,6 +13,7 @@
             <result property="agreementAbbreviation" column="agreement_abbreviation" jdbcType="VARCHAR"/>
             <result property="isEnable" column="is_enable" jdbcType="TINYINT"/>
             <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+            <result property="partnerCompanyId" column="partner_company_id" jdbcType="VARCHAR"/>
             <result property="startDate" column="start_date" jdbcType="TIMESTAMP"/>
             <result property="endDate" column="end_date" jdbcType="TIMESTAMP"/>
             <result property="moneyTime" column="money_time" jdbcType="INTEGER"/>
@@ -45,7 +46,7 @@
     <sql id="Base_Column_List">
         pa.id,pa.agreement_type,pa.agreement_code,
         pa.agreement_name,pa.agreement_title,pa.agreement_abbreviation,
-        pa.is_enable,pa.company_id,
+        pa.is_enable,pa.company_id,pa.partner_company_id,
         pa.start_date,pa.end_date,pa.money_time,
         pa.match_type,pa.docking_person,pa.docking_phone,
         pa.valid_status,pa.money_type,pa.file_id,
@@ -57,7 +58,7 @@
         pa.update_time,pa.is_delete,paa.username,paa.user_abbr as userAbbr,
         suji.name as managerName,sd.name as managerDeptName,
 --         suf.file_name as fileName,suf.file_size as fileSize,
-        eic.name_simple as company,sdd.name as deptName,
+        eic.name_simple as company,sdd.name as deptName,eica.name_simple as partnerCompanyName,
         pa.api_type,pa.jq_entrance_fee_ratio,pa.sy_entrance_fee_ratio,pa.jy_entrance_fee_ratio
     </sql>
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.AgreementVo">
@@ -69,6 +70,7 @@
         LEFT JOIN sys_dept sd on suji.dept_id = sd.id
         LEFT JOIN sys_upload_files suf on pa.file_id = suf.id
         LEFT JOIN esm_ins_company eic on pa.company_id = eic.id
+        LEFT JOIN esm_ins_company eica on pa.partner_company_id = eica.id
         <where>
             pa.is_delete = 0
             <if test="param.searchValue != null and param.searchValue != ''">
@@ -126,6 +128,7 @@
         LEFT JOIN sys_dept sd on suji.dept_id = sd.id
         LEFT JOIN sys_upload_files suf on pa.file_id = suf.id
         LEFT JOIN esm_ins_company eic on pa.company_id = eic.id
+        LEFT JOIN esm_ins_company eica on pa.partner_company_id = eica.id
         <where>
             pa.is_delete = 0
             <if test="param.searchValue != null and param.searchValue != ''">
@@ -180,6 +183,7 @@
         LEFT JOIN sys_dept sd on suji.dept_id = sd.id
 --         LEFT JOIN sys_upload_files suf on suf.id = pa.file_id
         LEFT JOIN esm_ins_company eic on pa.company_id = eic.id
+        LEFT JOIN esm_ins_company eica on pa.partner_company_id = eica.id
         <where>
             <if test="id != null and id != ''">
                 and pa.id = #{id}