| 
					
				 | 
			
			
				@@ -130,21 +130,12 @@ public class SupplierCapacityController extends JeecgController<SupplierCapacity 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public JSONObject list2(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                HttpServletRequest req){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      //System.out.println("开始月份"+supplierCapacityDto.getStartDate().getMonth()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      //System.out.println("结束月份"+supplierCapacityDto.getEndDate().getMonth()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      //System.out.println("开始年份"+new SimpleDateFormat("yyyy").format(supplierCapacityDto.getStartDate())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      //System.out.println("结束年份"+new SimpleDateFormat("yyyy").format(supplierCapacityDto.getEndDate())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      Result<IPage<SupplierCapacity>> result = new Result<IPage<SupplierCapacity>>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       QueryWrapper<SupplierCapacityDto> queryWrapper = new QueryWrapper<>();//初始化 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       IPage<SupplierCapacity> page2  = SupplierCapacityService.selectPage2(pageNo, pageSize, queryWrapper); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       JSONObject jsonobject = new JSONObject(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       jsonobject.put("data",page2.getRecords()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      jsonobject.put("sie",page2.getSize()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      jsonobject.put("size",page2.getSize()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       jsonobject.put("total",page2.getTotal()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      //  page.setRecords(pageList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      result.setSuccess(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      result.setResult(page2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      result.setMessage("查询成功"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return jsonobject; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |