Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
===================================================================
diff -u -r34041 -r34046
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java	(.../ConsumptiveMaterialContainerAction.java)	(revision 34041)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java	(.../ConsumptiveMaterialContainerAction.java)	(revision 34046)
@@ -30,6 +30,7 @@
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser;
 import com.forgon.disinfectsystem.maintain.device.consumptivematerial.service.ConsumptiveMaterialContainerManager;
+import com.forgon.entity.PageEntity;
 import com.forgon.exception.SystemException;
 import com.forgon.security.model.User;
 import com.forgon.tools.StrutsParamUtils;
@@ -40,6 +41,7 @@
 import com.forgon.tools.json.DateJsonValueProcessor;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
+import com.forgon.tools.util.PageUtil;
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Preparable;
 
@@ -224,8 +226,8 @@
 			Long userId = StrutsParamUtils.getPraramLongValue("userId", null);
 			Long consumptiveMaterialContainerId = StrutsParamUtils.getPraramLongValue("consumptiveMaterialContainerId", null);
 			Long consumptiveMaterialTypeId = StrutsParamUtils.getPraramLongValue("consumptiveMaterialTypeId", null);
-			int pageNow  = StrutsParamUtils.getPraramValue("pageNow", 0);
-			int pageSize = StrutsParamUtils.getPraramValue("pageSize", 20);
+			//分页的参数
+			PageEntity pageEntity = PageUtil.getPagePara();
 			String dateSql = "";
 			if(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
 				dateSql = " and " + dateQueryAdapter.strDateAreasql("po.operationDateTime", startDate, endDate, true);
@@ -250,22 +252,14 @@
 					userIdSql);
 			
 			int rowCount = objectDao.countBySql("select count(*) " + sql);
-			int pageCount=(rowCount-1)/pageSize+1;
-			if (pageNow > pageCount) {  //用户输的当前页大于最后一页
-				pageNow = pageCount;
-			} else if (pageNow < 1) {  //用户输的当前页小于1
-				pageNow = 1;
-			}
-			int fristIndex = pageSize*(pageNow - 1);
+			pageEntity.setCount(rowCount);
 			
 			sql = "select po " + sql;
 			@SuppressWarnings("unchecked")
-			List<ConsumptiveMaterialAddRecord> records = objectDao.findByHql(sql, fristIndex, pageSize);
+			List<ConsumptiveMaterialAddRecord> records = objectDao.findByHql(sql, pageEntity.getStart(), pageEntity.getLimit());
 			searchAssociativeObject(records);
 			map.put("data", records);
-			map.put("rowCount", rowCount);
-			map.put("pageCount", pageCount);
-			map.put("pageNow", pageNow);
+			map.put("totalCount", rowCount);
 			map.put("success", true);
 			JsonConfig config = new JsonConfig();
 			config.registerJsonValueProcessor(Date.class,new DateJsonValueProcessor("yyyy-MM-dd HH:mm:ss"));