|
@@ -115,9 +115,9 @@ public class ContainerServiceImpl implements ContainerService {
|
|
|
List<Object> head = Arrays.asList("部门", "类别", "容器编号","容器名称","数量","创建时间");
|
|
|
//查询数据
|
|
|
PageHelper.startPage(container.getPage(), container.getLimit());
|
|
|
- PageInfo<Map<String, Object>> list = new PageInfo<>(containerMapper.export(container));
|
|
|
+ List<Map<String, Object>> list = containerMapper.export(container);
|
|
|
sheetDataList.add(head);
|
|
|
- for(Map<String, Object> userMap : list.getList()){
|
|
|
+ for(Map<String, Object> userMap : list){
|
|
|
List<Object> listSheet = new ArrayList<>();
|
|
|
for(String key: userMap.keySet()){
|
|
|
listSheet.add(userMap.get(key));
|
|
@@ -158,9 +158,9 @@ public class ContainerServiceImpl implements ContainerService {
|
|
|
List<Object> head = Arrays.asList("操作人", "报废原因", "报废时间","报废数量","容器名称");
|
|
|
//查询数据
|
|
|
PageHelper.startPage(scrap.getPage(), scrap.getLimit());
|
|
|
- PageInfo<Map<String, Object>> list = new PageInfo<>(containerMapper.exportScrap(scrap));
|
|
|
+ List<Map<String, Object>> list = containerMapper.exportScrap(scrap);
|
|
|
sheetDataList.add(head);
|
|
|
- for(Map<String, Object> userMap : list.getList()){
|
|
|
+ for(Map<String, Object> userMap : list){
|
|
|
List<Object> listSheet = new ArrayList<>();
|
|
|
for(String key: userMap.keySet()){
|
|
|
listSheet.add(userMap.get(key));
|