出账检核-增加币种85

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

@@ -1350,7 +1350,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
             String brokerIds = brokerBizIdList.stream()
             String brokerIds = brokerBizIdList.stream()
                     .map(id -> "'" + id + "'")
                     .map(id -> "'" + id + "'")
                     .collect(Collectors.joining(","));
                     .collect(Collectors.joining(","));
-            queryWrapper.apply("EXISTS (SELECT 1 FROM policy_follow f WHERE f.policy_no = expected_fortune.policy_no AND f.first_broker_biz_id in (" + brokerIds + "))");
+            queryWrapper.apply("EXISTS (SELECT 1 FROM policy_broker pb WHERE pb.policy_no = expected_fortune.policy_no AND pb.broker_biz_id in (" + brokerIds + "))");
         }
         }
         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);

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

@@ -42,9 +42,9 @@ public class FortuneQueryRequest extends PageDto implements Serializable {
     private List<String> commissionStatusList;
     private List<String> commissionStatusList;
 
 
     /**
     /**
-     * 转介人（主）
+     * 转介人
      */
      */
-    @Schema(description = "转介人（主）")
+    @Schema(description = "转介人")
     private String brokerName;
     private String brokerName;
 
 
     /**
     /**

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

@@ -118,7 +118,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
 
 
         queryWrapper.gt(ObjectUtils.isNotEmpty(payoutDateStart), "payout_date", payoutDateStart);
         queryWrapper.gt(ObjectUtils.isNotEmpty(payoutDateStart), "payout_date", payoutDateStart);
         queryWrapper.lt(ObjectUtils.isNotEmpty(payoutDateEnd), "payout_date", payoutDateEnd);
         queryWrapper.lt(ObjectUtils.isNotEmpty(payoutDateEnd), "payout_date", payoutDateEnd);
-        queryWrapper.eq(StringUtils.isNotBlank(brokerName), "broker", brokerName);
+        queryWrapper.like(StringUtils.isNotBlank(brokerName), "broker", "%" + brokerName + "%");
 
 
         // 入账状态, 关联查询 commission_expected 表
         // 入账状态, 关联查询 commission_expected 表
         if (CollUtil.isNotEmpty(commissionStatusList)) {
         if (CollUtil.isNotEmpty(commissionStatusList)) {