push

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

@@ -150,11 +150,6 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         return CommissionExpectedVOPage;
         return CommissionExpectedVOPage;
     }
     }
 
 
-    //要返回CommissionExpectedNewVO分页记录，现在有一张预计来用表和一张保单来用表。两张表通过commission_expected_biz_id关联，现在要做查询合并两个表结果集，
-    //预计来用表和保单来用表是1对多的关系，现在想合并两个结果集合，预计来用的主记录在上面下面紧跟着保单来用记录。
-    //getCommissionExpectedVOPage是之前查询预计来用表记录的逻辑，pageByCommissionexpectedBizId是查询之前保单来用表的逻辑，可以参考这两个逻辑合并写到getCommissionExpectedVONewPage中
-    //返回记录里面  来佣类型：1-预计（预计来佣表记录） 2-实际（保单来佣表记录）
-    //
     @Override
     @Override
     public Page<CommissionExpectedNewVO> getCommissionExpectedVONewPage(Page<CommissionExpected> commissionExpectedPage) {
     public Page<CommissionExpectedNewVO> getCommissionExpectedVONewPage(Page<CommissionExpected> commissionExpectedPage) {
         List<CommissionExpected> commissionExpectedList = commissionExpectedPage.getRecords();
         List<CommissionExpected> commissionExpectedList = commissionExpectedPage.getRecords();