新单跟进78

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

@@ -49,5 +49,12 @@ public class CommissionQueryRequest extends PageDto implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date commissionDateEnd;
     private Date commissionDateEnd;
 
 
+    /**
+     * 预计入账日期
+     */
+    @Schema(description = "预计入账日期 格式-yyyy-MM-dd", example = "2023-01-01")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date expectedDate;
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 }
 }
\ No newline at end of file

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

@@ -66,6 +66,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         String reconciliationCompany = commissionQueryRequest.getReconciliationCompany();
         String reconciliationCompany = commissionQueryRequest.getReconciliationCompany();
         Date commissionDateStart = commissionQueryRequest.getCommissionDateStart();
         Date commissionDateStart = commissionQueryRequest.getCommissionDateStart();
         Date commissionDateEnd = commissionQueryRequest.getCommissionDateEnd();
         Date commissionDateEnd = commissionQueryRequest.getCommissionDateEnd();
+        Date expectedDate = commissionQueryRequest.getExpectedDate();
 
 
         queryWrapper.eq(StringUtils.isNotBlank(status), "status", status);
         queryWrapper.eq(StringUtils.isNotBlank(status), "status", status);
         queryWrapper.like(StringUtils.isNotBlank(policyNo), "policy_no", policyNo);
         queryWrapper.like(StringUtils.isNotBlank(policyNo), "policy_no", policyNo);
@@ -74,6 +75,10 @@ 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);
         }
         }
+        // 查询预计入账日期及之前的记录
+        if (expectedDate != null) {
+            queryWrapper.lt("expected_date", expectedDate);
+        }
 
 
         queryWrapper.orderByDesc("id");
         queryWrapper.orderByDesc("id");
         return queryWrapper;
         return queryWrapper;