wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1;分页

This commit is contained in:
wangshuai 2024-08-09 02:47:08 +08:00
parent 9e42550ea2
commit 596de3b497
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java
View File

@ -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;
} }
/** /**