|
@@ -688,14 +688,14 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
|
688
|
688
|
|
689
|
689
|
/**
|
690
|
690
|
* 根据payType分页获取缴费或未缴费的数据
|
691
|
|
- * @param userElement
|
|
691
|
+ * @param personId
|
692
|
692
|
* @param payType
|
693
|
693
|
* @param pageNum
|
694
|
694
|
* @param pageSize
|
695
|
695
|
* @return
|
696
|
696
|
*/
|
697
|
697
|
@Override
|
698
|
|
- public Map<String, Object> getBillsList(TaUser userElement, Integer payType, Integer pageNum, Integer pageSize) {
|
|
698
|
+ public Map<String, Object> getBillsList(String personId, Integer payType, Integer pageNum, Integer pageSize) {
|
699
|
699
|
|
700
|
700
|
|
701
|
701
|
/**
|
|
@@ -704,7 +704,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
|
704
|
704
|
|
705
|
705
|
//使用分页插件
|
706
|
706
|
IPage<Map<String,Object>> page = new Page<>(pageNum, pageSize);
|
707
|
|
- IPage<Map<String,Object>> billsPage = billInvoiceMapper.getBillsList(page,userElement.getOrgId(), userElement.getRoomNoId(), payType);
|
|
707
|
+ IPage<Map<String,Object>> billsPage = billInvoiceMapper.getBillsList(page,1, personId, payType);
|
708
|
708
|
List<Map<String, Object>> billsList = billsPage.getRecords();
|
709
|
709
|
billsList.forEach(e-> {
|
710
|
710
|
String payPrice = String.valueOf(e.get("payPrice"));
|