出账检核-增加币种28

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

@@ -1306,7 +1306,6 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         List<String> brokerBizIdList = request.getBrokerBizIdList();
         List<String> brokerBizIdList = request.getBrokerBizIdList();
         List<String> signerBizIdList = request.getSignerBizIdList();
         List<String> signerBizIdList = request.getSignerBizIdList();
         String fortuneBizType = request.getFortuneBizType();
         String fortuneBizType = request.getFortuneBizType();
-        String policyHolder = request.getPolicyHolder();
 
 
         // 按保单号模糊查询
         // 按保单号模糊查询
         queryWrapper.eq(ObjectUtils.isNotEmpty(payableNo), "payable_no", payableNo);
         queryWrapper.eq(ObjectUtils.isNotEmpty(payableNo), "payable_no", payableNo);
@@ -1323,11 +1322,6 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         queryWrapper.in(ObjectUtils.isNotEmpty(brokerBizIdList), "broker_biz_id", brokerBizIdList);
         queryWrapper.in(ObjectUtils.isNotEmpty(brokerBizIdList), "broker_biz_id", brokerBizIdList);
         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);
-        // 根据投保人名称查询
-        if (StringUtils.isNotBlank(policyHolder)) {
-            queryWrapper.apply("EXISTS (SELECT 1 FROM policy_follow f WHERE f.policy_no = commission_expected.policy_no AND (f.policy_holder like '%{0}%') or f.policy_holder_en like '%{0}%')",
-                    policyHolder);
-        }
 
 
         queryWrapper.in(ObjectUtils.isNotEmpty(request.getPolicyNoList()), "policy_no", request.getPolicyNoList());
         queryWrapper.in(ObjectUtils.isNotEmpty(request.getPolicyNoList()), "policy_no", request.getPolicyNoList());
         // 按id升序排序
         // 按id升序排序

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

@@ -39,9 +39,6 @@ public class ApiExpectedFortunePageRequest extends PageDto {
     @Schema(description = "出账项目类型 1=销售佣金;等等 字典值: csf_fortune_type")
     @Schema(description = "出账项目类型 1=销售佣金;等等 字典值: csf_fortune_type")
     private String fortuneType;
     private String fortuneType;
 
 
-    @Schema(description = "投保人名称")
-    private String policyHolder;
-
     @Schema(description = "出单团队名称")
     @Schema(description = "出单团队名称")
     private String team;
     private String team;
 
 
@@ -63,9 +60,7 @@ public class ApiExpectedFortunePageRequest extends PageDto {
     @Schema(description = "应付款类型 R-关联保单应付款 U-非关联保单应付款")
     @Schema(description = "应付款类型 R-关联保单应付款 U-非关联保单应付款")
     private String fortuneBizType;
     private String fortuneBizType;
 
 
-    /**
-     * 保單持有人（中/英）
-     */
+    @Schema(description = "保單持有人（中/英）")
     private String policyHolder;
     private String policyHolder;
 
 
     private List<String> PolicyNoList;
     private List<String> PolicyNoList;