push

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

@@ -1078,7 +1078,11 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
 
 
     @Override
     @Override
     public Result<PayableReportResponse> payableReport(ApiExpectedFortunePageRequest request) {
     public Result<PayableReportResponse> payableReport(ApiExpectedFortunePageRequest request) {
+        //保單持有人（中/英）、签单人、转介人名称（主）查询保单号列表
+        List<String> queryPolicyNoList = policyFollowService.queryPolicyNoList(request.getPolicyHolder(),"","");
+
         // 构建查询条件
         // 构建查询条件
+        request.setPolicyNoList(queryPolicyNoList);
         QueryWrapper<ExpectedFortune> queryWrapper = this.getQueryWrapper(request);
         QueryWrapper<ExpectedFortune> queryWrapper = this.getQueryWrapper(request);
 
 
         // 先查询所有符合条件的记录ID（用于统计）
         // 先查询所有符合条件的记录ID（用于统计）
@@ -1225,6 +1229,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         queryWrapper.in(ObjectUtils.isNotEmpty(signerBizIdList), "signer_biz_id", signerBizIdList);
         queryWrapper.in(ObjectUtils.isNotEmpty(signerBizIdList), "signer_biz_id", signerBizIdList);
         queryWrapper.eq(StringUtils.isNotBlank(fortuneBizType), "fortune_biz_type", fortuneBizType);
         queryWrapper.eq(StringUtils.isNotBlank(fortuneBizType), "fortune_biz_type", fortuneBizType);
 
 
+        queryWrapper.in(ObjectUtils.isNotEmpty(request.getPolicyNoList()), "policy_no", request.getPolicyNoList());
         // 按id升序排序
         // 按id升序排序
         queryWrapper.orderByAsc("id");
         queryWrapper.orderByAsc("id");
         return queryWrapper;
         return queryWrapper;

yd-csf-feign/src/main/java/com/yd/csf/feign/request/expectedfortune/ApiExpectedFortunePageRequest.java

@@ -59,4 +59,12 @@ public class ApiExpectedFortunePageRequest extends PageDto {
 
 
     @Schema(description = "应付款类型 R-关联保单应付款 U-非关联保单应付款")
     @Schema(description = "应付款类型 R-关联保单应付款 U-非关联保单应付款")
     private String fortuneBizType;
     private String fortuneBizType;
+
+    /**
+     * 保單持有人（中/英）
+     */
+    private String policyHolder;
+
+    private List<String> PolicyNoList;
+
 }
 }

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

@@ -134,4 +134,14 @@ public class PayableReportVO {
      */
      */
     @Schema(description = "产品计划")
     @Schema(description = "产品计划")
     private String productName;
     private String productName;
+
+    /**
+     * 保單持有人（投保人，保单表）（中文名）
+     */
+    private String policyHolder;
+
+    /**
+     * 保單持有人（投保人，保单表）（英文名）
+     */
+    private String policyHolderEn;
 }
 }

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

@@ -55,6 +55,8 @@
         select
         select
             null as payable_no,
             null as payable_no,
             ef.policy_no as policyNo,
             ef.policy_no as policyNo,
+            (select pp.name from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolder,
+            (select pp.name_en from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolderEn,
             MAX(ef.premium) as premium,
             MAX(ef.premium) as premium,
             MAX(ef.insurance_company_biz_id) as insuranceCompanyBizId,
             MAX(ef.insurance_company_biz_id) as insuranceCompanyBizId,
             MAX(p.insurance_company) as insuranceCompany,
             MAX(p.insurance_company) as insuranceCompany,
@@ -108,6 +110,8 @@
         select
         select
             ef.payable_no as payable_no,
             ef.payable_no as payable_no,
             ef.policy_no as policyNo,
             ef.policy_no as policyNo,
+            (select pp.name from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolder,
+            (select pp.name_en from policy_policyholder pp where pp.policy_biz_id = p.policy_biz_id limit 1) as policyHolderEn,
             ef.premium as premium,
             ef.premium as premium,
             ef.insurance_company_biz_id as insuranceCompanyBizId,
             ef.insurance_company_biz_id as insuranceCompanyBizId,
             p.insurance_company as insuranceCompany,
             p.insurance_company as insuranceCompany,