Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskTaskParam.java
===================================================================
diff -u -r41613 -r41635
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskTaskParam.java	(.../WaitPackingTaskTaskParam.java)	(revision 41613)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskTaskParam.java	(.../WaitPackingTaskTaskParam.java)	(revision 41635)
@@ -4,8 +4,32 @@
  *
  */
 public class WaitPackingTaskTaskParam {
+	/**
+	 * 清洗时间过滤
+	 * 精确到分
+	 * PackingTask.WashTime是个字符串
+	 * 过滤的不是PackingTask.WashTime，而是PackingTask.washRecord_id的清洗记录的清洗开始时间startDate
+	 */
+	private String filterWashTime; 
+	/**
+	 * 清洗时间过滤是之前 还是 之后
+	 * true=之前  PackingTask.WashTime <=，false=之后 PackingTask.WashTime >=
+	 */
+	private Boolean isBeforeModeForWashTime;
 	
 	/**
+	 * 回收时间过滤
+	 * 精确到分
+	 * 其实是过滤PackingTask.startTime
+	 */
+	private String filterRecyclingTime; 
+	/**
+	 * 回收时间过滤是之前 还是 之后
+	 * true=之前  PackingTask.startTime <=，false=之后   PackingTask.startTime >=
+	 * 
+	 */
+	private Boolean isBeforeModeForRecyclingTime;
+	/**
 	 * 页码
 	 */
 	private Integer pageIndex = 1;
@@ -33,6 +57,30 @@
 	 * 篮筐条码
 	 */
 	private String basketBarcode;
+	public String getFilterWashTime() {
+		return filterWashTime;
+	}
+	public void setFilterWashTime(String filterWashTime) {
+		this.filterWashTime = filterWashTime;
+	}
+	public Boolean getIsBeforeModeForWashTime() {
+		return isBeforeModeForWashTime;
+	}
+	public void setIsBeforeModeForWashTime(Boolean isBeforeModeForWashTime) {
+		this.isBeforeModeForWashTime = isBeforeModeForWashTime;
+	}
+	public String getFilterRecyclingTime() {
+		return filterRecyclingTime;
+	}
+	public void setFilterRecyclingTime(String filterRecyclingTime) {
+		this.filterRecyclingTime = filterRecyclingTime;
+	}
+	public Boolean getIsBeforeModeForRecyclingTime() {
+		return isBeforeModeForRecyclingTime;
+	}
+	public void setIsBeforeModeForRecyclingTime(Boolean isBeforeModeForRecyclingTime) {
+		this.isBeforeModeForRecyclingTime = isBeforeModeForRecyclingTime;
+	}
 	public Integer getPageIndex() {
 		return pageIndex;
 	}