|
|
@@ -17,18 +17,20 @@ import javax.persistence.OneToOne;
|
|
|
import javax.persistence.OrderBy;
|
|
|
import javax.persistence.SequenceGenerator;
|
|
|
import javax.persistence.Table;
|
|
|
+import javax.persistence.Transient;
|
|
|
|
|
|
import org.codehaus.jackson.annotate.JsonIgnore;
|
|
|
import org.hibernate.annotations.ForeignKey;
|
|
|
import org.hibernate.annotations.Where;
|
|
|
|
|
|
import com.alibaba.fastjson.annotation.JSONField;
|
|
|
+import com.uas.platform.b2b.core.util.DateUtils;
|
|
|
|
|
|
/**
|
|
|
* 平台里面,以供应商的角度来查看采购询价单
|
|
|
*
|
|
|
* @author yingp
|
|
|
- *
|
|
|
+ *
|
|
|
*/
|
|
|
@SuppressWarnings("deprecation")
|
|
|
@Table(name = "purc$inquiry")
|
|
|
@@ -116,8 +118,7 @@ public class PurchaseInquiry implements Serializable {
|
|
|
/**
|
|
|
* 询价明细
|
|
|
*/
|
|
|
- @OneToMany(mappedBy = "inquiry", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE,
|
|
|
- CascadeType.MERGE }, fetch = FetchType.EAGER)
|
|
|
+ @OneToMany(mappedBy = "inquiry", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
|
|
|
@OrderBy("number")
|
|
|
private Set<PurchaseInquiryItem> inquiryItems;
|
|
|
|
|
|
@@ -145,7 +146,7 @@ public class PurchaseInquiry implements Serializable {
|
|
|
/**
|
|
|
* 是否过期
|
|
|
*/
|
|
|
- @Column(name = "in_overdue", insertable = false, updatable = false)
|
|
|
+ @Transient
|
|
|
private Short overdue;
|
|
|
|
|
|
public Long getId() {
|
|
|
@@ -279,11 +280,7 @@ public class PurchaseInquiry implements Serializable {
|
|
|
}
|
|
|
|
|
|
public Short getOverdue() {
|
|
|
- return overdue;
|
|
|
- }
|
|
|
-
|
|
|
- public void setOverdue(Short overdue) {
|
|
|
- this.overdue = overdue;
|
|
|
+ return DateUtils.compare(new Date(), this.endDate, DateUtils.COMPARE_DAY) == 1 ? (short) 1 : 0;
|
|
|
}
|
|
|
|
|
|
}
|