【贝腾】【获取回款通知接口只取预收回款】

src/main/java/com/uas/eis/service/Impl/STKServiceImpl.java

@@ -206,13 +206,13 @@ public class STKServiceImpl implements STKService {
             return Result.error("回款通知(预收)无数据!");
         }
         // 4. 批量查询回款通知明细
-        List<RecBalanceNoticeDetailDTO> recBalanceNoticeDetailDTOS = baseDao.query("select rbd_id,rbd_rbid,rbd_detno,rbd_sacode,rbd_date,rbd_currency,rbd_amount,rbd_sellercode,rbd_sellername,rbd_payments,rbd_ordertype,rbd_remark,sa_total,sa_prepayamount,sa_quyu_user from RECBALANCENOTICEDetail LEFT JOIN Sale on rbd_sacode=sa_code where rbd_rbid in (select rb_id from (select rownum rn,AA.* from (select * from RecBalanceNotice where rb_statuscode in ('AUDITED') order by rb_id desc) AA) where rn>="+start+" and rn<="+end+") order by rbd_rbid desc,rbd_detno" , RecBalanceNoticeDetailDTO.class);
+        List<RecBalanceNoticeDetailDTO> recBalanceNoticeDetailDTOS = baseDao.query("select rbd_id,rbd_rbid,rbd_detno,rbd_sacode,rbd_date,rbd_currency,rbd_amount,rbd_sellercode,rbd_sellername,rbd_payments,rbd_ordertype,rbd_remark,sa_total,sa_prepayamount,sa_quyu_user from RECBALANCENOTICEDetail LEFT JOIN Sale on rbd_sacode=sa_code where rbd_rbid in (select rb_id from (select rownum rn,AA.* from (select * from RecBalanceNotice where rb_kind='预收款' and rb_statuscode in ('AUDITED') order by rb_id desc) AA) where rn>="+start+" and rn<="+end+") order by rbd_rbid desc,rbd_detno" , RecBalanceNoticeDetailDTO.class);
         // 5. 按回款通知ID分组订单明细
         Map<BigDecimal, List<RecBalanceNoticeDetailDTO>> recBalanceNoticeDetailMap = recBalanceNoticeDetailDTOS.stream().collect(Collectors.groupingBy(RecBalanceNoticeDetailDTO::getRbd_rbid));
         // 6. 组装数据
         List<RecBalanceNoticeResp> recBalanceNoticeResps = assembleRecBalanceNoticeData(recBalanceNoticeDTOS, recBalanceNoticeDetailMap);
 
-        int count = baseDao.getCount("select count(1) from RecBalanceNotice where rb_statuscode in ('AUDITED') ");
+        int count = baseDao.getCount("select count(1) from RecBalanceNotice where rb_kind='预收款' and rb_statuscode in ('AUDITED') ");
 
         Map<String,Object> map = new HashMap<>();
         map.put("pageNum", pageNum);