push

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

@@ -241,7 +241,7 @@ public class ApiCommissionExpectedController {
                 .map(CommissionExpected::getId)
                 .map(CommissionExpected::getId)
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
         CommissionExpectedStatisticsVO statisticsNewVO = commissionExpectedService
         CommissionExpectedStatisticsVO statisticsNewVO = commissionExpectedService
-                .getExpectedStatisticsNew(expectedIds);
+                .getExpectedStatisticsNew(allExpectedList);
 
 
         // 获取混合分页结果
         // 获取混合分页结果
         Page<CommissionExpectedNewVO> mixedPage = commissionExpectedService
         Page<CommissionExpectedNewVO> mixedPage = commissionExpectedService
@@ -380,7 +380,7 @@ public class ApiCommissionExpectedController {
         List<Long> allExpectedIdList = allCommissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList());
         List<Long> allExpectedIdList = allCommissionExpectedList.stream().map(CommissionExpected::getId).collect(Collectors.toList());
 
 
         // 查询统计数据（基于所有符合条件的记录）
         // 查询统计数据（基于所有符合条件的记录）
-        CommissionExpectedStatisticsVO statisticsVO = commissionExpectedService.getExpectedStatisticsNew(allExpectedIdList);
+        CommissionExpectedStatisticsVO statisticsVO = commissionExpectedService.getExpectedStatisticsNew(allCommissionExpectedList);
 
 
         // 应收款报表分页查询 - 按保单号和期数维度统计
         // 应收款报表分页查询 - 按保单号和期数维度统计
         Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());
         Page<ReceivableReportVO> reportPage = new Page<>(commissionExpectedQueryRequest.getPageNo(), commissionExpectedQueryRequest.getPageSize());

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

@@ -60,7 +60,7 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
 
 
     CommissionExpectedStatisticsVO getExpectedStatistics(List<Long> expectedIds);
     CommissionExpectedStatisticsVO getExpectedStatistics(List<Long> expectedIds);
 
 
-    CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<Long> expectedIds);
+    CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<CommissionExpected> allExpectedList);
 
 
     CommissionExpected getByBizId(String commissionExpectedBizId);
     CommissionExpected getByBizId(String commissionExpectedBizId);
 
 

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

@@ -970,17 +970,17 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
     }
     }
 
 
     @Override
     @Override
-    public CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<Long> expectedIds) {
+    public CommissionExpectedStatisticsVO getExpectedStatisticsNew(List<CommissionExpected> allExpectedList) {
         // 空集合直接返回空统计
         // 空集合直接返回空统计
-        if (CollectionUtils.isEmpty(expectedIds)) {
+        if (CollectionUtils.isEmpty(allExpectedList)) {
             return emptyStatistics();
             return emptyStatistics();
         }
         }
 
 
         // 查询所有记录（包含失效状态）
         // 查询所有记录（包含失效状态）
-        List<CommissionExpected> allExpectedList = this.listByIds(expectedIds);
-        if (CollectionUtils.isEmpty(allExpectedList)) {
-            return emptyStatistics();
-        }
+//        List<CommissionExpected> allExpectedList = this.listByIds(expectedIds);
+//        if (CollectionUtils.isEmpty(allExpectedList)) {
+//            return emptyStatistics();
+//        }
 
 
         // 过滤掉已失效的记录（status = "3"）
         // 过滤掉已失效的记录（status = "3"）
         List<CommissionExpected> validList = allExpectedList.stream()
         List<CommissionExpected> validList = allExpectedList.stream()