|
|
@@ -2,6 +2,7 @@ package com.ydtech.modules.inv.service.impl;
|
|
|
|
|
|
import com.alibaba.excel.util.ListUtils;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.core.page.PageRequest;
|
|
|
@@ -275,14 +276,24 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
|
|
|
@Override
|
|
|
public HttpResult look(InvAccountQueryVo invAccountQueryVo) {
|
|
|
List<InvAccount> insAccounts = insAccountMapper.selectAccountsList(invAccountQueryVo);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
List<InvAccountProfit> invAccountProfitList = invAccountProfitService.list();
|
|
|
List<InvAccountOp> list = invAccountOpService.list();
|
|
|
|
|
|
List<Map<String, String>> head = head(invAccountProfitList);
|
|
|
List<Map<String, String>> maps = dataList(insAccounts, list, invAccountProfitList);
|
|
|
+
|
|
|
+ List<Map<String, String>> subList = maps.stream().skip((invAccountQueryVo.getPageNo()-1)*invAccountQueryVo.getPageSize()).limit(invAccountQueryVo.getPageSize()).
|
|
|
+ collect(Collectors.toList());
|
|
|
+
|
|
|
InvAccountOpDto invAccountOpDto = new InvAccountOpDto();
|
|
|
invAccountOpDto.setHead(head);
|
|
|
- invAccountOpDto.setMaps(maps);
|
|
|
+ invAccountOpDto.setMaps(subList);
|
|
|
+ invAccountOpDto.setTotal(maps.size());
|
|
|
+ invAccountOpDto.setPageSize(invAccountQueryVo.getPageSize());
|
|
|
+ invAccountOpDto.setPageNo(invAccountQueryVo.getPageNo());
|
|
|
return HttpResult.ok("",invAccountOpDto);
|
|
|
}
|
|
|
|