新单跟进107

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

@@ -84,9 +84,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         if (commissionDateStart != null && commissionDateEnd != null) {
         if (commissionDateStart != null && commissionDateEnd != null) {
             queryWrapper.between("commission_date", commissionDateStart, commissionDateEnd);
             queryWrapper.between("commission_date", commissionDateStart, commissionDateEnd);
         }
         }
-        // 查询预计入账日期及之前的记录
+        // 查询预计入账日期及之前的记录, 关联查询 commission_expected 表
         if (expectedDate != null) {
         if (expectedDate != null) {
-            queryWrapper.lt("expected_date", expectedDate);
+            queryWrapper.apply("exists (select 1 from commission_expected where commission_expected_biz_id = commission.commission_expected_biz_id and commission_date <= {0} and status = {1})", expectedDate);
         }
         }
 
 
         queryWrapper.orderByDesc("id");
         queryWrapper.orderByDesc("id");