1

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

@@ -824,7 +824,7 @@ public class StorageQualitycheckController {
             @ApiImplicitParam(name = "checkType", value = "检验类型(0:自检,3:出库检验,4:春秋普查,5:第三方检查)", paramType = "query"),
             @ApiImplicitParam(name = "historyStatus", value = "数据状态(0:新数据,1:已归档数据)", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "组织机构ID", paramType = "query"),
-            @ApiImplicitParam(name = "processState", value = "1扦样化验待处理 2化验已处理", paramType = "query")
+            @ApiImplicitParam(name = "processState", value = "1:已扦样但化验待处理,2:化验已保存,3:化验已提交", paramType = "query")
     })
     public  Map<String, Object> queryCheckDataDetail(Integer houseId, Integer wareId, String checkType, 
 			Integer historyStatus, Integer orgId, Integer processState){

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

@@ -201,13 +201,15 @@ public class StorageWarterCheckController {
 			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
 			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
 			@ApiImplicitParam(name = "storehouse", value = "仓房", paramType = "query"),
-			@ApiImplicitParam(name = "warehouse", value = "货位", paramType = "query")
+			@ApiImplicitParam(name = "warehouse", value = "货位", paramType = "query"),
+			@ApiImplicitParam(name = "orgId", value = "库ID", paramType = "query"),
+			@ApiImplicitParam(name = "dataStatus", value = "数据状态(0:保存,1:提交)", paramType = "query")
 	})
-	public PageInfo<StorageWaterCheck> findWarterData(HttpServletRequest request, Integer pageNum, Integer pageSize,  Integer storehouse, Integer warehouse) {
+	public PageInfo<StorageWaterCheck> findWarterData(HttpServletRequest request, Integer pageNum, Integer pageSize,  
+			Integer storehouse, Integer warehouse, Integer orgId, String dataStatus) {
 
 		List<StorageWaterCheck> list = null;
 		PageInfo<StorageWaterCheck> pageInfo = null;
-		Integer orgId = (Integer) request.getSession().getAttribute("orgId");
 		StorageWaterCheckExample example = new StorageWaterCheckExample();
 		StorageWaterCheckExample.Criteria criteria = example.createCriteria();
 		example.setOrderByClause(" hy_date desc");
@@ -225,14 +227,16 @@ public class StorageWarterCheckController {
 		if (null != warehouse){
 			criteria.andWareIdEqualTo(warehouse);
 		}
-		 
-		
+		if (StringUtils.isNotBlank(dataStatus)){
+			criteria.andDataStatusEqualTo(dataStatus);
+		}
+
 		list = storageWaterCheckService.findWarterData(example);
 
 		pageInfo = new PageInfo<StorageWaterCheck>(list);
 		return pageInfo;
 
-		}
+	}
 	
 	@RequestMapping(value = "/selectWaterData",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
 	@ApiOperation(value="原粮粮情-水分检测-查询水分数据表")