push

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

@@ -23,17 +23,17 @@ public interface CommissionExpectedMapper extends BaseMapper<CommissionExpected>
 
 
     CommissionExpectedStatisticsVO getExpectedStatistics(@Param("expectedIds")List<Long> expectedIds);
     CommissionExpectedStatisticsVO getExpectedStatistics(@Param("expectedIds")List<Long> expectedIds);
 
 
-//    /**
-//     * 应收款报表 - 按保单号和期数维度统计（分页）
-//     * @param page 分页参数
-//     * @param expectedIds 预计来佣ID列表
-//     * @return 应收款报表VO分页列表
-//     */
-//    IPage<ReceivableReportVO> receivableReportPage(@Param("page") Page<ReceivableReportVO> page,
-//                                                   @Param("expectedIds") List<Long> expectedIds);
-
-    IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page,
-                                                   @Param("query") CommissionExpectedQueryRequest query);
+    /**
+     * 应收款报表 - 按保单号和期数维度统计（分页）
+     * @param page 分页参数
+     * @param expectedIds 预计来佣ID列表
+     * @return 应收款报表VO分页列表
+     */
+    IPage<ReceivableReportVO> receivableReportPage(@Param("page") Page<ReceivableReportVO> page,
+                                                   @Param("expectedIds") List<Long> expectedIds);
+
+//    IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page,
+//                                                   @Param("query") CommissionExpectedQueryRequest query);
 }
 }
 
 
 
 

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

@@ -82,10 +82,10 @@ 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, List<Long> expectedIds);
 
 
-    IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page,
-                                                   CommissionExpectedQueryRequest query);
+//    IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page,
+//                                                   CommissionExpectedQueryRequest query);
 
 
     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

@@ -1481,16 +1481,16 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         return cal.getTime();
         return cal.getTime();
     }
     }
 
 
-//    @Override
-//    public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, List<Long> expectedIds) {
-//        return baseMapper.receivableReportPage(page, expectedIds);
-//    }
-
     @Override
     @Override
-    public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page,
-                                                          CommissionExpectedQueryRequest query){
-        return baseMapper.receivableReportPage(page, query);
-    };
+    public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page, List<Long> expectedIds) {
+        return baseMapper.receivableReportPage(page, expectedIds);
+    }
+
+//    @Override
+//    public IPage<ReceivableReportVO> receivableReportPage(Page<ReceivableReportVO> page,
+//                                                          CommissionExpectedQueryRequest query){
+//        return baseMapper.receivableReportPage(page, query);
+//    };
 
 
     @Override
     @Override
     public void testExpectedCommission(String policyNo,String effectiveDate,String coolingOffEndDate) throws IOException {
     public void testExpectedCommission(String policyNo,String effectiveDate,String coolingOffEndDate) throws IOException {