根据仓房货位或者油罐id获取质检信息(验收)

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -713,6 +713,88 @@ public class StorageQualitycheckController {
         return modelMap;
     }
 
+    /**
+     * 根据仓房和货位获取验收的数据
+     * 分页获取
+     */
+    @RequestMapping(value = "/getPageInfoByChAndHw",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    @ApiOperation(value="根据仓房和货位获取验收的数据", notes = "支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "houseIds", value = "仓房id(数组)", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseIds", value = "货位id(数组)", paramType = "query")
+    })
+    public PageInfo<StorageQualitycheck> getPageInfoByChAndHw(Integer pageNum, Integer pageSize,
+            Integer[] houseIds, Integer[] warehouseIds , String[] tankIds ,String checktype) {
+    	
+    	
+    	StorageQualitycheck qualityCheck = new StorageQualitycheck();
+        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+        if (StringUtils.isNotBlank(checktype)){
+            qualityCheck.setType(checktype);
+        }
+        
+        qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
+        
+        List<StorageQualitycheck> qualityCheckList = null;
+        List<StorageQualitycheck> qualityCheckListNew = new ArrayList<StorageQualitycheck>();
+        
+        //粮食
+        if(houseIds!=null && warehouseIds!=null ){
+        	if(houseIds.length>0 && warehouseIds.length>0){
+            	for (int i = 0; i < houseIds.length; i++) {
+                	for (int j = 0; j < warehouseIds.length; j++) {
+                    	if(i==j){
+                    		Integer houseId = houseIds[i];
+                    		Integer warehouseId = warehouseIds[j];
+                    		 	//仓房id.
+                    	            qualityCheck.setHouseId(houseId);
+
+                    	        // 货位id.
+                    	            qualityCheck.setWarehouseId(warehouseId);
+                    	        if (pageNum!=null && pageSize!=null) {
+                    	            PageHelper.startPage(pageNum, pageSize);
+                    	        }
+                    	        
+                    	        qualityCheckList = storageQualitycheckService.queryByQualitycheck(qualityCheck);
+                    	        if(qualityCheckList!=null && qualityCheckList.size()>0){
+                        	        qualityCheckListNew.add(qualityCheckList.get(0));
+                    	        }
+                    	}
+            		}
+        		}
+            }
+        }
+        
+        
+        //油类
+        if(tankIds!=null){
+        	 if(tankIds.length>0){
+             	for (int j = 0; j < tankIds.length; j++) {
+                 		String tankId = tankIds[j];
+                 	     // 油罐id.
+                 	     qualityCheck.setTankId(tankId);
+                 	    if (pageNum!=null && pageSize!=null) {
+                 	         PageHelper.startPage(pageNum, pageSize);
+                 	    }
+                 	        
+                 	    qualityCheckList = storageQualitycheckService.queryByQualitycheck(qualityCheck);
+                 	    if(qualityCheckList!=null && qualityCheckList.size()>0){
+               	          qualityCheckListNew.add(qualityCheckList.get(0));
+           	            }
+         		}
+         }
+        }
+        PageInfo<StorageQualitycheck> pageInfo = new PageInfo<StorageQualitycheck>(qualityCheckListNew);
+        if(pageInfo.getList()!=null){
+        	pageInfo.setStartRow(pageInfo.getStartRow()+1);
+        	pageInfo.setEndRow(pageInfo.getEndRow()+1);
+        }
+        return pageInfo;
+    }
+    
+    
     //质检信息主表同步
     @RequestMapping("/qualityMainSynchronization")
     public void qualityMainSynchronization() {