时间筛选

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1174 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/history/model/PurchaseOrderAll.java

@@ -148,6 +148,18 @@ public class PurchaseOrderAll {
 	@OneToMany(mappedBy = "order", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
 	@OrderBy("number")
 	private Set<PurchaseOrderAllItem> orderItems;
+	
+	/**
+	 * 显示状态(0 已查看 ， 1 未查看， 2 置顶)
+	 */
+	@Column(name = "pu_display")
+	private Short display;
+	
+	/**
+	 * 打印次数
+	 */
+	@Column(name = "pu_print")
+	private Short print;
 
 	public Long getId() {
 		return id;
@@ -308,4 +320,20 @@ public class PurchaseOrderAll {
 	public void setOrderItems(Set<PurchaseOrderAllItem> orderItems) {
 		this.orderItems = orderItems;
 	}
+
+	public Short getDisplay() {
+		return display;
+	}
+
+	public void setDisplay(Short display) {
+		this.display = display;
+	}
+
+	public Short getPrint() {
+		return print;
+	}
+
+	public void setPrint(Short print) {
+		this.print = print;
+	}
 }

src/main/java/com/uas/platform/b2b/history/model/PurchaseOrderEnd.java

@@ -152,6 +152,18 @@ public class PurchaseOrderEnd {
 	@OrderBy("number")
 	@Where(clause = "pd_end=1")
 	private Set<PurchaseOrderEndItem> orderItems;
+	
+	/**
+	 * 显示状态(0 已查看 ， 1 未查看， 2 置顶)
+	 */
+	@Column(name = "pu_display")
+	private Short display;
+	
+	/**
+	 * 打印次数
+	 */
+	@Column(name = "pu_print")
+	private Short print;
 
 	public Long getId() {
 		return id;
@@ -312,4 +324,20 @@ public class PurchaseOrderEnd {
 	public void setOrderItems(Set<PurchaseOrderEndItem> orderItems) {
 		this.orderItems = orderItems;
 	}
+
+	public Short getDisplay() {
+		return display;
+	}
+
+	public void setDisplay(Short display) {
+		this.display = display;
+	}
+
+	public Short getPrint() {
+		return print;
+	}
+
+	public void setPrint(Short print) {
+		this.print = print;
+	}
 }

src/main/java/com/uas/platform/b2b/history/model/PurchaseOrderTodo.java

@@ -153,6 +153,18 @@ public class PurchaseOrderTodo {
 	@Where(clause = "pd_status = 200")
 	@OrderBy("number")
 	private Set<PurchaseOrderTodoItem> orderItems;
+	
+	/**
+	 * 显示状态(0 已查看 ， 1 未查看， 2 置顶)
+	 */
+	@Column(name = "pu_display")
+	private Short display;
+	
+	/**
+	 * 打印次数
+	 */
+	@Column(name = "pu_print")
+	private Short print;
 
 	public Long getId() {
 		return id;
@@ -313,4 +325,20 @@ public class PurchaseOrderTodo {
 	public void setOrderItems(Set<PurchaseOrderTodoItem> orderItems) {
 		this.orderItems = orderItems;
 	}
+
+	public Short getDisplay() {
+		return display;
+	}
+
+	public void setDisplay(Short display) {
+		this.display = display;
+	}
+
+	public Short getPrint() {
+		return print;
+	}
+
+	public void setPrint(Short print) {
+		this.print = print;
+	}
 }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -99,8 +99,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		if (StringUtils.hasText(keyword))
 			pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
 					.getUser().getEnterprise().getUu(), keyword), false));
-		System.out.println("fromDate == " + fromDate);
-		System.out.println("endDate == " + endDate);
 		if (fromDate != null)
 			pageInfo.expression(PredicateUtils.in("id", purchaseOrderAllDao.findByFromDate(new Date(fromDate)), false));
 		if(endDate != null)