push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java

@@ -384,10 +384,7 @@ public class ApiCommissionExpectedController {
 
 
         // 应收款报表分页查询 - 按保单号和期数维度统计
         // 应收款报表分页查询 - 按保单号和期数维度统计
         Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
         Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
-        IPage<ReceivableReportVO> receivableReportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
-        if (!CollectionUtils.isEmpty(allExpectedIdList)) {
-            receivableReportPage = commissionExpectedService.receivableReportPage(reportPage, allExpectedIdList);
-        }
+        IPage<ReceivableReportVO> receivableReportPage = commissionExpectedService.receivableReportPage(reportPage, queryWrapper);
 //        enrichReceivableReportWithCompanyName(receivableReportPage);
 //        enrichReceivableReportWithCompanyName(receivableReportPage);
         receivableReportPage = convertReceivableReport(receivableReportPage);
         receivableReportPage = convertReceivableReport(receivableReportPage);
         // 组装返回结果
         // 组装返回结果

yd-csf-service/src/main/java/com/yd/csf/service/dao/CommissionExpectedMapper.java

 package com.yd.csf.service.dao;
 package com.yd.csf.service.dao;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.model.CommissionExpected;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -27,7 +29,7 @@ public interface CommissionExpectedMapper extends BaseMapper<CommissionExpected>
      * @return 应收款报表VO分页列表
      * @return 应收款报表VO分页列表
      */
      */
     IPage<ReceivableReportVO> receivableReportPage(@Param("page") Page<ReceivableReportVO> page,
     IPage<ReceivableReportVO> receivableReportPage(@Param("page") Page<ReceivableReportVO> page,
-                                                    @Param("expectedIds") List<Long> expectedIds);
+                                                   @Param(Constants.WRAPPER) QueryWrapper<CommissionExpected> wrapper);
 }
 }
 
 
 
 

yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionExpectedService.java

@@ -82,7 +82,7 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
      * @param expectedIds 预计来佣ID列表
      * @param expectedIds 预计来佣ID列表
      * @return 应收款报表VO分页列表
      * @return 应收款报表VO分页列表
      */
      */
-    IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, List<Long> expectedIds);
+    IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, QueryWrapper<CommissionExpected> wrapper);
 
 
     void testExpectedCommission(String policyNo,String effectiveDate,String coolingOffEndDate) throws IOException;
     void testExpectedCommission(String policyNo,String effectiveDate,String coolingOffEndDate) throws IOException;
 
 

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

@@ -1482,8 +1482,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
     }
     }
 
 
     @Override
     @Override
-    public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, List<Long> expectedIds) {
-        return baseMapper.receivableReportPage(page, expectedIds);
+    public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, QueryWrapper<CommissionExpected> wrapper) {
+        return baseMapper.receivableReportPage(page, wrapper);
     }
     }
 
 
     @Override
     @Override