1;分页
This commit is contained in:
parent
9e42550ea2
commit
596de3b497
|
@ -65,11 +65,9 @@ public class BusIntegralConsumeController extends BaseController
|
||||||
startPage();
|
startPage();
|
||||||
busIntegralRecord.setIntegralType("sms");
|
busIntegralRecord.setIntegralType("sms");
|
||||||
List<BusIntegralRecord> list1 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
List<BusIntegralRecord> list1 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
||||||
clearPage();
|
TableDataInfo rspData = getDataTable(list1);
|
||||||
startPage();
|
|
||||||
busIntegralRecord.setIntegralType("AI");
|
busIntegralRecord.setIntegralType("AI");
|
||||||
List<BusIntegralRecord> list2 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
List<BusIntegralRecord> list2 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
||||||
clearPage();
|
|
||||||
list1 = list1.stream().map(bean -> {
|
list1 = list1.stream().map(bean -> {
|
||||||
for(BusIntegralRecord busIntegralRecord1:list2){
|
for(BusIntegralRecord busIntegralRecord1:list2){
|
||||||
if(busIntegralRecord1.getAccount().equals(bean.getAccount())){
|
if(busIntegralRecord1.getAccount().equals(bean.getAccount())){
|
||||||
|
@ -79,7 +77,8 @@ public class BusIntegralConsumeController extends BaseController
|
||||||
}
|
}
|
||||||
return bean;
|
return bean;
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
return getDataTable(list1);
|
rspData.setRows(list1);
|
||||||
|
return rspData;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue