push

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

@@ -375,12 +375,13 @@ public class ApiCommissionExpectedController {
         commissionExpectedQueryRequest.setQueryFlag(queryFlag);
         commissionExpectedQueryRequest.setQueryFlag(queryFlag);
         QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
         QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
 
 
+        List<Long> allExpectedIdList = new ArrayList<>();
         // 先查询所有符合条件的记录ID（用于统计）
         // 先查询所有符合条件的记录ID（用于统计）
-        List<CommissionExpected> allCommissionExpectedList = commissionExpectedService.list(queryWrapper);
-        List<Long> allExpectedIdList = allCommissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList());
+//        List<CommissionExpected> allCommissionExpectedList = commissionExpectedService.list(queryWrapper);
+//        List<Long> allExpectedIdList = allCommissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList());
 
 
         // 查询统计数据（基于所有符合条件的记录）
         // 查询统计数据（基于所有符合条件的记录）
-        CommissionExpectedStatisticsVO statisticsVO = commissionExpectedService.getExpectedStatisticsNew(allCommissionExpectedList);
+//        CommissionExpectedStatisticsVO statisticsVO = commissionExpectedService.getExpectedStatisticsNew(allCommissionExpectedList);
 
 
         // 应收款报表分页查询 - 按保单号和期数维度统计
         // 应收款报表分页查询 - 按保单号和期数维度统计
         Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
         Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
@@ -392,7 +393,7 @@ public class ApiCommissionExpectedController {
         receivableReportPage = convertReceivableReport(receivableReportPage);
         receivableReportPage = convertReceivableReport(receivableReportPage);
         // 组装返回结果
         // 组装返回结果
         ReceivableReportResponse response = new ReceivableReportResponse();
         ReceivableReportResponse response = new ReceivableReportResponse();
-        response.setStatisticsVO(statisticsVO);
+//        response.setStatisticsVO(statisticsVO);
         response.setPage(receivableReportPage);
         response.setPage(receivableReportPage);
         return Result.success(response);
         return Result.success(response);
     }
     }