Quellcode durchsuchen

前台获取粮库名称

gaodandan vor 6 Jahren
Ursprung
Commit
12350363c8

+ 0 - 13
src/main/java/com/chinaitop/depot/device/controller/StorageDeviceGetController.java

@@ -57,8 +57,6 @@ public class StorageDeviceGetController {
57
 	@Resource
57
 	@Resource
58
 	private BasicEquipmentEquipmentPoolService equipmentPoolService;
58
 	private BasicEquipmentEquipmentPoolService equipmentPoolService;
59
 	
59
 	
60
-	/*@Resource
61
-	private OrgInfoService orgInfoService;*/
62
 	
60
 	
63
 	 /**
61
 	 /**
64
      * 分页获取器材信息
62
      * 分页获取器材信息
@@ -88,17 +86,6 @@ public class StorageDeviceGetController {
88
    
86
    
89
         PageHelper.startPage(pageNum, pageSize);
87
         PageHelper.startPage(pageNum, pageSize);
90
         List<StorageDeviceget> list = deviceGetService.queryByDevice(storageDevicegetExample);
88
         List<StorageDeviceget> list = deviceGetService.queryByDevice(storageDevicegetExample);
91
-       if(list!=null && list.size()>0){
92
-    	   for (StorageDeviceget storageDeviceget : list) {
93
-    		   
94
-    		   /*UserInfo userInfo =(UserInfo) request.getSession().getAttribute("userInfo");
95
-        	if(userInfo.getOrgId()!=null){
96
-        		OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
97
-        		storageDeviceget.setOrgName(orgInfo.getOrgName());
98
-        	}*/
99
-    		   storageDeviceget.setOrgName(orgName);
100
-    	   }
101
-       }
102
         PageInfo<StorageDeviceget> pageInfo = new PageInfo<StorageDeviceget>(list);
89
         PageInfo<StorageDeviceget> pageInfo = new PageInfo<StorageDeviceget>(list);
103
         return pageInfo;
90
         return pageInfo;
104
     }
91
     }

+ 0 - 16
src/main/java/com/chinaitop/depot/device/controller/StorageDeviceInputController.java

@@ -78,22 +78,6 @@ public class StorageDeviceInputController {
78
         
78
         
79
         PageHelper.startPage(pageNum, pageSize);
79
         PageHelper.startPage(pageNum, pageSize);
80
         List<StorageDeviceinput> list = deviceInputService.queryByDevice(storageDeviceinputExample);
80
         List<StorageDeviceinput> list = deviceInputService.queryByDevice(storageDeviceinputExample);
81
-        if(list.size()>0 && list!=null){
82
-        	
83
-        	for (StorageDeviceinput storageDeviceinput : list) {
84
-        		if(orgName!=null){
85
-        			storageDeviceinput.setOrgName(orgName);
86
-        		}
87
-        		if(storageDeviceinput.getPosition()!=null){
88
-        			BasicEquipmentEquipmentPool equipmentEquipmentPool=poolServivce.findByIdObj(Integer.parseInt(storageDeviceinput.getPosition()));
89
-        			if(equipmentEquipmentPool!=null){
90
-        				storageDeviceinput.setPositionName(equipmentEquipmentPool.getPutPosition());
91
-        			}
92
-        			
93
-        		}
94
-        	}
95
-        }
96
-        
97
         PageInfo<StorageDeviceinput> pageInfo = new PageInfo<StorageDeviceinput>(list);
81
         PageInfo<StorageDeviceinput> pageInfo = new PageInfo<StorageDeviceinput>(list);
98
         return pageInfo;
82
         return pageInfo;
99
     }
83
     }

+ 0 - 10
src/main/java/com/chinaitop/depot/device/controller/StorageDeviceKeepController.java

@@ -81,16 +81,6 @@ public class StorageDeviceKeepController {
81
             PageHelper.startPage(pageNum, pageSize);
81
             PageHelper.startPage(pageNum, pageSize);
82
         }
82
         }
83
         List<StorageDevicekeep> list = deviceKeepService.queryByDevice(storageDevicekeepExample);
83
         List<StorageDevicekeep> list = deviceKeepService.queryByDevice(storageDevicekeepExample);
84
-        if(list!=null && list.size()>0){
85
-        	for (StorageDevicekeep storageDevicekeep : list) {
86
-        		/*UserInfo userInfo =(UserInfo) request.getSession().getAttribute("userInfo");
87
-       	   if(userInfo.getOrgId()!=null){
88
-        		OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
89
-        		storageDevicekeep.setOrgName(orgInfo.getOrgName());
90
-        	}*/
91
-        		storageDevicekeep.setOrgName(orgName);
92
-        	}
93
-        }
94
         PageInfo<StorageDevicekeep> pageInfo = new PageInfo<StorageDevicekeep>(list);
84
         PageInfo<StorageDevicekeep> pageInfo = new PageInfo<StorageDevicekeep>(list);
95
         return pageInfo;
85
         return pageInfo;
96
     }
86
     }

+ 0 - 10
src/main/java/com/chinaitop/depot/device/controller/StorageDeviceRepairController.java

@@ -70,16 +70,6 @@ public class StorageDeviceRepairController {
70
             PageHelper.startPage(pageNum, pageSize);
70
             PageHelper.startPage(pageNum, pageSize);
71
         }
71
         }
72
         List<StorageDevicerepair> list = deviceRepairService.queryByDevice(storageDevicerepairExample);
72
         List<StorageDevicerepair> list = deviceRepairService.queryByDevice(storageDevicerepairExample);
73
-        if(list!=null && list.size()>0){
74
-        	for (StorageDevicerepair storageDevicerepair : list) {
75
-        		/*UserInfo userInfo =(UserInfo) request.getSession().getAttribute("userInfo");
76
-        	   if(userInfo.getOrgId()!=null){
77
-         		OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
78
-         		storageDevicerepair.setOrgName(orgInfo.getOrgName());
79
-         	}*/
80
-        		storageDevicerepair.setOrgName(orgName);
81
-        	}
82
-        }
83
         PageInfo<StorageDevicerepair> pageInfo = new PageInfo<StorageDevicerepair>(list);
73
         PageInfo<StorageDevicerepair> pageInfo = new PageInfo<StorageDevicerepair>(list);
84
         return pageInfo;
74
         return pageInfo;
85
     }
75
     }