。。

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

@@ -1,5 +1,7 @@
 package com.chinaitop.depot.storage.controller;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -48,7 +50,7 @@ public class StorageChangeStoragehouseRopController {
 			@ApiImplicitParam(name = "applyTimeB", value = "申请日期B", paramType = "query"),
 			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query") })
 	public PageInfo<StorageChangeStoragehouseDefault> getList(Integer pageNum, Integer pageSize, String changehouseNo,
-		String applyTimeA, String applyTimeB, Integer orgId) {
+		String applyTimeA, String applyTimeB, String createTime,Integer orgId,Integer ch,Integer hwh) throws ParseException {
 		StorageChangeStoragehouseDefaultExample StorageChangeStoragehouseDefaultExample = new StorageChangeStoragehouseDefaultExample();
 		Criteria Criteria = StorageChangeStoragehouseDefaultExample.createCriteria();
 		if (pageNum != null && pageSize != null) {
@@ -67,6 +69,17 @@ public class StorageChangeStoragehouseRopController {
 			Date starDate = ParameterUtil.string2datetime(applyTimeB + " 23:59:59");
 			Criteria.andApplyTimeLessThanOrEqualTo(starDate);
 		}
+		if (createTime != null && !"".equals(createTime)) {
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			Date createDate  = simpleDateFormat.parse(createTime);
+			Criteria.andCreateTimeGreaterThanOrEqualTo(createDate);
+		}
+		if (ch != null && !"".equals(ch)) {
+			Criteria.andOutStorehouseEqualTo(ch);
+		}
+		if (hwh != null && !"".equals(hwh)) {
+			Criteria.andOutWarehouseEqualTo(hwh);
+		}
 		if (orgId != null && !"".equals(orgId)) {
 			Criteria.andOrgIdEqualTo(orgId);
 		}