push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPremiumReconciliationServiceImpl.java

@@ -101,7 +101,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
         //保单受保人（被保人）
         //保单受保人（被保人）
         premiumReconciliation.setInsured(policy.getInsured());
         premiumReconciliation.setInsured(policy.getInsured());
         //保险公司名称
         //保险公司名称
-        premiumReconciliation.setInsurer(policy.getInsuranceCompany());
+        premiumReconciliation.setInsuranceCompany(policy.getInsuranceCompany());
         //保单号
         //保单号
         premiumReconciliation.setPolicyNo(policy.getPolicyNo());
         premiumReconciliation.setPolicyNo(policy.getPolicyNo());
         //保费对账记录表唯一业务ID
         //保费对账记录表唯一业务ID

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/premiumreconciliation/ApiPremiumReconciliationDto.java

@@ -35,4 +35,16 @@ public class ApiPremiumReconciliationDto {
      */
      */
     @NotBlank(message = "被保人不能为空")
     @NotBlank(message = "被保人不能为空")
     private String insured;
     private String insured;
+
+    /**
+     * 保险公司
+     */
+    @NotBlank(message = "保险公司不能为空")
+    private String insuranceCompany;
+
+    /**
+     * 保险公司业务id
+     */
+    @NotBlank(message = "保险公司业务id不能为空")
+    private String insuranceCompanyBizId;
 }
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/response/premiumreconciliation/ApiPremiumReconciliationPageResponse.java

@@ -2,6 +2,7 @@ package com.yd.csf.feign.response.premiumreconciliation;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
@@ -9,9 +10,9 @@ import java.time.LocalDateTime;
 public class ApiPremiumReconciliationPageResponse {
 public class ApiPremiumReconciliationPageResponse {
 
 
     /**
     /**
-     * 保险公司名称（保单表）
+     * 保险公司
      */
      */
-    private String insurer;
+    private String insuranceCompany;
 
 
     /**
     /**
      * 保单号（保单表）
      * 保单号（保单表）

yd-csf-service/src/main/java/com/yd/csf/service/model/PremiumReconciliation.java

@@ -68,10 +68,16 @@ public class PremiumReconciliation implements Serializable {
     private String insured;
     private String insured;
 
 
     /**
     /**
-     * 保险公司名称
+     * 保险公司
      */
      */
-    @TableField("insurer")
-    private String insurer;
+    @TableField("insurance_company")
+    private String insuranceCompany;
+
+    /**
+     * 保险公司业务id
+     */
+    @TableField("insurance_company_biz_id")
+    private String insuranceCompanyBizId;
 
 
     /**
     /**
      * 当次保司认定金额（客户当次缴纳的金额）
      * 当次保司认定金额（客户当次缴纳的金额）

yd-csf-service/src/main/resources/mappers/PremiumReconciliationMapper.xml

@@ -5,7 +5,7 @@
     <select id="page"
     <select id="page"
             resultType="com.yd.csf.feign.response.premiumreconciliation.ApiPremiumReconciliationPageResponse">
             resultType="com.yd.csf.feign.response.premiumreconciliation.ApiPremiumReconciliationPageResponse">
         SELECT
         SELECT
-            MAX(p.insurance_company) AS insurer,
+            MAX(p.insurance_company) AS insuranceCompany,
             pr.policy_no,
             pr.policy_no,
             MAX(pf.status) AS policyFollowStatus,
             MAX(pf.status) AS policyFollowStatus,
             MAX(pr.reconciliation_status) AS reconciliation_status,
             MAX(pr.reconciliation_status) AS reconciliation_status,