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

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

@@ -677,6 +677,8 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         if (!Objects.isNull(apiInsurantInfoDto)) {
             // 受保人
             follow.setInsured(apiInsurantInfoDto.getNameCn());
+            // 受保人业务id
+            follow.setInsuredBizId(apiInsurantInfoDto.getInsurantBizId());
             // 受保人与保單持有人关系
             if ("MYSELF".equals(apiInsurantInfoDto.getPolicyholderRel())) {
                 follow.setInsured(follow.getPolicyHolder());

yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowAddRequest.java

@@ -139,6 +139,12 @@ public class PolicyFollowAddRequest implements Serializable {
     private String insured;
 
     /**
+     * 受保人业务id
+     */
+    @Schema(description = "受保人业务id")
+    private String insuredBizId;
+
+    /**
      * 币种
      */
     @Schema(description = "币种")

yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowDto.java

@@ -167,6 +167,9 @@ public class PolicyFollowDto implements Serializable {
     @Schema(description = "受保人")
     private String insured;
 
+    @Schema(description = "受保人业务id")
+    private String insuredBizId;
+
     @Schema(description = "受保人年龄")
     private Integer insuredAge;
 

yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowUpdateDto.java

@@ -141,6 +141,12 @@ public class PolicyFollowUpdateDto implements Serializable {
     private String insured;
 
     /**
+     * 受保人业务id
+     */
+    @Schema(description = "受保人业务id")
+    private String insuredBizId;
+
+    /**
      * 保单币种
      */
     @Schema(description = "保单币种")

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

@@ -266,6 +266,11 @@ public class PolicyFollow implements Serializable {
     private String insured;
 
     /**
+     * 受保人业务id
+     */
+    private String insuredBizId;
+
+    /**
      * 受保人年龄
      */
     private Integer insuredAge;

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java

@@ -110,7 +110,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         List<String> productLaunchBizIdList = policyFollowQueryRequest.getProductLaunchBizIdList();
         String issueNumber = policyFollowQueryRequest.getIssueNumber();
 
-        queryWrapper.eq(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
+        queryWrapper.like(ObjectUtils.isNotEmpty(policyNo), "policy_no", policyNo);
         queryWrapper.eq(ObjectUtils.isNotEmpty(status), "status", status);
         queryWrapper.eq(ObjectUtils.isNotEmpty(appointmentNo), "appointment_no", appointmentNo);
         queryWrapper.ge(ObjectUtils.isNotEmpty(signDateStart), "sign_date", signDateStart);

yd-csf-service/src/main/java/com/yd/csf/service/vo/PolicyFollowVO.java

@@ -85,6 +85,12 @@ public class PolicyFollowVO implements Serializable {
     private String insured;
 
     /**
+     * 受保人业务id
+     */
+    @Schema(description = "受保人业务id")
+    private String insuredBizId;
+
+    /**
      * 产品计划唯一业务ID
      */
     @Schema(description = "产品计划唯一业务ID")

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

@@ -54,6 +54,7 @@
         <result property="nextStatusList" column="next_status_list" />
         <result property="policyHolder" column="policy_holder" />
         <result property="insured" column="insured" />
+        <result property="insuredBizId" column="insured_biz_id" />
         <result property="insuredAge" column="insured_age" />
         <result property="gracePeriod" column="grace_period" />
         <result property="isJoin" column="is_join" />
@@ -92,7 +93,7 @@
         each_issue_premium,is_prepay,is_traceable,retroactive_date,prepaid_term,
         prepaid_amount,prepaid_amount_after_discount,policy_expiration_date,payment_number,product_launch_biz_id,
         product_name,product_cate,category_code,insurance_company,insurance_company_biz_id,reconciliation_company,insurance_category_biz_id,
-        reconciliation_company_biz_id,status,next_status_list,policy_holder,insured,
+        reconciliation_company_biz_id,status,next_status_list,policy_holder,insured,insured_biz_id,
         insured_age,grace_period,is_join,policy_currency,initial_payment_method,
         initial_premium,initial_premium_total,initial_payment_status,initial_premium_discount,
         mailing_method,renewal_payment_method,dividend_distribution_method,delivery_no,