| 
					
				 | 
			
			
				@@ -430,6 +430,7 @@ public class StatisticalReportController extends BaseRESTfulController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                        String isPage, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                        String index 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     ){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (index!=null&&!"null".equals(index)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             mapValue.put("index",index); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -439,7 +440,6 @@ public class StatisticalReportController extends BaseRESTfulController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ("yes".equals(isPage)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return  success(statisticalReportService.getInwardInFactory(mapValue)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         PageHelper.startPage(pageNum, pageSize); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //分页数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<Map<String, Object>> report = statisticalReportService.getInwardInFactory(mapValue); 
			 |