水分检验

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

@@ -17,8 +17,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.chinaitop.depot.storage.model.StorageChangeStoragehouseTask;
 import com.chinaitop.depot.storage.model.StorageWarterFixedPoint;
+import com.chinaitop.depot.storage.model.StorageWarterFixedPointExample;
 import com.chinaitop.depot.storage.model.StorageWarterMobilePoint;
+import com.chinaitop.depot.storage.model.StorageWarterMobilePointExample;
 import com.chinaitop.depot.storage.model.StorageWaterCheck;
 import com.chinaitop.depot.storage.model.StorageWaterCheckExample;
 import com.chinaitop.depot.storage.service.StorageWarterCheckService;
@@ -188,4 +191,58 @@ public class StorageWarterCheckController {
 		return map;
 	}
 
-}
+	@RequestMapping(value = "/findWarterData",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 = "orgId", value = "单位ID", paramType = "query")
+	})
+	public PageInfo<StorageWaterCheck> findWarterData(Integer pageNum, Integer pageSize, Integer orgId, Integer storehouse, Integer warehouse) {
+
+		List<StorageWaterCheck> list = null;
+		PageInfo<StorageWaterCheck> pageInfo = null;
+		StorageWaterCheckExample example = new StorageWaterCheckExample();
+		StorageWaterCheckExample.Criteria criteria = example.createCriteria();
+
+		if (null != pageNum && null != pageSize) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		if (null != orgId) {
+			criteria.andOrgIdEqualTo(orgId);
+		}
+		/*
+		 * if (null != storehouse) { criteria.andHouseIdEqualTo(storehouse); } if (null
+		 * != warehouse) { criteria.andWareIdEqualTo(warehouse); }
+		 */
+		
+		list = storageWaterCheckService.findWarterData(example);
+
+		pageInfo = new PageInfo<StorageWaterCheck>(list);
+		return pageInfo;
+
+		}
+	
+	@RequestMapping(value = "/selectWaterData",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+	@ApiOperation(value="原粮粮情-水分检测-查询水分数据表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+			@ApiImplicitParam(name = "warterId", value = "storage_water_check表主键ID", paramType = "query")
+	})
+	public Map<String, Object> selectWaterData(String warterId) {
+
+		Map<String, Object> modelMap = new HashMap<String, Object>(); //水分主表
+		StorageWaterCheck storageWaterCheck = storageWaterCheckService.findbyidStorageWaterCheck(warterId);
+		modelMap.put("StorageWaterCheck", storageWaterCheck); //水分检验机动点信息表
+		
+		List<StorageWarterFixedPoint> list = storageWarterFixedPointService.findCondition(warterId);
+		modelMap.put("StorageWarterFixedPoint", list); //水分检验固定点信息表
+		
+		
+		List<StorageWarterMobilePoint> mobileList = storageWarterMobilePointService.findCondition(warterId);
+		modelMap.put("StorageWarterMobilePoint", mobileList); //水分检验机动点信息表
+		return modelMap;
+
+		}
+	}

src/main/java/com/chinaitop/depot/storage/service/StorageWarterCheckService.java

@@ -51,4 +51,12 @@ public interface StorageWarterCheckService {
 	 * @param dataType
 	 */
 	public void deleteFlt(String id, Integer dataType);
+
+	/**
+	* 按条件查询主表数据集合
+	 *
+	 * @param example
+	 * @return
+			 */
+	public List<StorageWaterCheck> findWarterData(StorageWaterCheckExample example);
 }

src/main/java/com/chinaitop/depot/storage/service/impl/StorageWarterCheckServiceImpl.java

@@ -260,5 +260,9 @@ public class StorageWarterCheckServiceImpl implements StorageWarterCheckService
 			storageWarterMobilePointMapper.deleteByPrimaryKey(id);
 		}
 	}
-
+	@Override
+	public List<StorageWaterCheck> findWarterData(StorageWaterCheckExample example) {
+		List<StorageWaterCheck> list = storageWaterCheckMapper.selectByExample(example);
+		return list;
+	}
 }