Browse Source

问题修改

zhs 2 năm trước cách đây
mục cha
commit
5a7d23b29c

+ 4 - 4
src/main/java/com/tld/service/impl/ContainerServiceImpl.java

@@ -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));

+ 2 - 2
src/main/java/com/tld/service/impl/DepartmentServiceImpl.java

@@ -91,9 +91,9 @@ public class DepartmentServiceImpl implements DepartmentService {
             List<Object> head = Arrays.asList("部门编号", "部门名称", "创建时间");
             //查询数据
             PageHelper.startPage(department.getPage(), department.getLimit());
-            PageInfo<Map<String, Object>> list = new PageInfo<>(departmentMapper.export(department));
+            List<Map<String, Object>> list = departmentMapper.export(department);
             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));

+ 2 - 2
src/main/java/com/tld/service/impl/QueryListServiceImpl.java

@@ -90,9 +90,9 @@ public class QueryListServiceImpl implements QueryListService {
             List<Object> head = Arrays.asList("物料code", "物料名称", "库位名称", "数量");
             //查询数据
             PageHelper.startPage(inventory.getPage(), inventory.getLimit());
-            PageInfo<Map<String, Object>> list = new PageInfo<>(queryListMapper.getStorageLocation(inventory));
+            List<Map<String, Object>> list = queryListMapper.getStorageLocation(inventory);
             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));

+ 2 - 3
src/main/java/com/tld/service/impl/RoleServiceImpl.java

@@ -95,10 +95,9 @@ public class RoleServiceImpl implements RoleService {
             //表头数据
             List<Object> head = Arrays.asList("角色编号", "角色名", "创建时间","备注");
             //查询数据
-            PageHelper.startPage(role.getPage(), role.getLimit());
-            PageInfo<Map<String, Object>> list = new PageInfo<>(roleMapper.export(role));
+            List<Map<String, Object>> list = roleMapper.export(role);
             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));

+ 2 - 2
src/main/java/com/tld/service/impl/StorageLocationServiceImpl.java

@@ -99,9 +99,9 @@ public class StorageLocationServiceImpl implements StorageLocationService {
             List<Object> head = Arrays.asList("库位编号", "库位名称", "所在仓库","库位类型","库位容量","是否混合库位","创建时间");
             //查询数据
             PageHelper.startPage(storageLocation.getPage(), storageLocation.getLimit());
-            PageInfo<Map<String, Object>> list = new PageInfo<>(storageLocationMapper.export(storageLocation));
+            List<Map<String, Object>> list = storageLocationMapper.export(storageLocation);
             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));

+ 2 - 2
src/main/java/com/tld/service/impl/UserServiceImpl.java

@@ -165,9 +165,9 @@ public class UserServiceImpl implements UserService {
             List<Object> head = Arrays.asList("用户编号", "用户名", "真名","邮箱","电话", "手机", "部门", "角色", "创建时间");
             //查询数据
             PageHelper.startPage(1, 10);
-            PageInfo<Map<String, Object>> list = new PageInfo<>(userMapper.getUserExportData(user));
+            List<Map<String, Object>> list = userMapper.getUserExportData(user);
             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));