|
|
@@ -42,7 +42,7 @@ public class PurchaseInquiryItemSimpleInfo {
|
|
|
|
|
|
public static final String STATUS_FIELD = "id_status";
|
|
|
|
|
|
- public static final String VENDTODATE_FIELD = "id_vendtodate";
|
|
|
+ public static final String TODATE_FIELD = "id_todate";
|
|
|
|
|
|
public static final String OVERDUE_FIELD = "id_overdue";
|
|
|
|
|
|
@@ -89,8 +89,8 @@ public class PurchaseInquiryItemSimpleInfo {
|
|
|
/**
|
|
|
* 报价有效期截止
|
|
|
*/
|
|
|
- @Column(name = VENDTODATE_FIELD)
|
|
|
- private Date vendToDate;
|
|
|
+ @Column(name = TODATE_FIELD)
|
|
|
+ private Date toDate;
|
|
|
|
|
|
/**
|
|
|
* 询价单
|
|
|
@@ -209,12 +209,12 @@ public class PurchaseInquiryItemSimpleInfo {
|
|
|
this.agreed = agreed;
|
|
|
}
|
|
|
|
|
|
- public Date getVendToDate() {
|
|
|
- return vendToDate;
|
|
|
+ public Date getToDate() {
|
|
|
+ return toDate;
|
|
|
}
|
|
|
|
|
|
- public void setVendToDate(Date vendToDate) {
|
|
|
- this.vendToDate = vendToDate;
|
|
|
+ public void setToDate(Date toDate) {
|
|
|
+ this.toDate = toDate;
|
|
|
}
|
|
|
|
|
|
public Date getDate() {
|
|
|
@@ -272,7 +272,7 @@ public class PurchaseInquiryItemSimpleInfo {
|
|
|
|
|
|
@SuppressWarnings("deprecation")
|
|
|
public Short getInvalid() {
|
|
|
- if (this.vendToDate == null) {
|
|
|
+ if (this.toDate == null) {
|
|
|
return 0;
|
|
|
}
|
|
|
Date before = new Date();
|
|
|
@@ -282,9 +282,9 @@ public class PurchaseInquiryItemSimpleInfo {
|
|
|
now.set(Calendar.MONTH, date.getMonth());
|
|
|
now.set(Calendar.DAY_OF_MONTH, date.getDate());
|
|
|
Calendar end = Calendar.getInstance();
|
|
|
- end.set(Calendar.YEAR, this.vendToDate.getYear());
|
|
|
- end.set(Calendar.MONTH, this.vendToDate.getMonth());
|
|
|
- end.set(Calendar.DAY_OF_MONTH, this.vendToDate.getDate());
|
|
|
+ end.set(Calendar.YEAR, this.toDate.getYear());
|
|
|
+ end.set(Calendar.MONTH, this.toDate.getMonth());
|
|
|
+ end.set(Calendar.DAY_OF_MONTH, this.toDate.getDate());
|
|
|
if (now.compareTo(end) > 0) {
|
|
|
return 1;
|
|
|
} else {
|
|
|
@@ -315,7 +315,7 @@ public class PurchaseInquiryItemSimpleInfo {
|
|
|
", product=" + product +
|
|
|
", sendStatus=" + sendStatus +
|
|
|
", decideStatus=" + decideStatus +
|
|
|
- ", vendToDate=" + vendToDate +
|
|
|
+ ", toDate=" + toDate +
|
|
|
", inquiry=" + inquiry +
|
|
|
", status=" + status +
|
|
|
", id_overdue=" + id_overdue +
|