소스 검색

B2B采购询价单 - B2B端业务变更,搜索项目未做对应修改,导致失效单据索引存在问题处理。

dongbw 7 년 전
부모
커밋
d9025cc6c7

+ 12 - 12
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseInquiryItemSimpleInfo.java

@@ -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 +

+ 3 - 3
search-console-b2b/src/main/java/com/uas/search/console/b2b/util/DocumentToObjectUtils.java

@@ -829,9 +829,9 @@ public class DocumentToObjectUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.DECIDESTATUS_FIELD))));
 		}
 		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.VENDTODATE_FIELD))) {
-			purcInquiryItem.setVendToDate(new Date(Long.valueOf(document.get(
-					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.VENDTODATE_FIELD)))));
+				.get(ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.TODATE_FIELD))) {
+			purcInquiryItem.setToDate(new Date(Long.valueOf(document.get(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.TODATE_FIELD)))));
 		}
 		if (null != document
 				.get(ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.STATUS_FIELD))) {

+ 3 - 3
search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ObjectToDocumentUtils.java

@@ -1311,10 +1311,10 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.DECIDESTATUS_FIELD),
 					String.valueOf(inquiryItem.getDecideStatus()), Store.YES));
 		}
-		if (null != inquiryItem.getVendToDate()) {
+		if (null != inquiryItem.getToDate()) {
 			document.add(new LongField(
-					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.VENDTODATE_FIELD),
-					inquiryItem.getVendToDate().getTime(), Store.YES));
+					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.TODATE_FIELD),
+					inquiryItem.getToDate().getTime(), Store.YES));
 		}
 		if (null != inquiryItem.getStatus()) {
 			document.add(new StringField(