Эх сурвалжийг харах

询价单增加询价种类字段

hejq 8 жил өмнө
parent
commit
72de133213

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

@@ -53,6 +53,8 @@ public class PurchaseInquiryItemSimpleInfo {
 
 	public static final String DATE_FIELD = "id_date";
 
+	public static final String KIND_FIELD = "id_kind";
+
 	@Id
 	@Column(name = ID_FIELD)
 	private Long id;
@@ -130,6 +132,12 @@ public class PurchaseInquiryItemSimpleInfo {
 	@Column(name = DATE_FIELD)
 	private Date date;
 
+	/**
+	 * 单据归属日期
+	 */
+	@Column(name = KIND_FIELD)
+	private String kind;
+
 	public Long getId() {
 		return id;
 	}
@@ -210,6 +218,14 @@ public class PurchaseInquiryItemSimpleInfo {
 		this.date = date;
 	}
 
+	public String getKind() {
+		return kind;
+	}
+
+	public void setKind(String kind) {
+		this.kind = kind;
+	}
+
 	@SuppressWarnings("deprecation")
 	public Short getOverdue() {
 		if (this.status == 314 || this.getInvalid() == 1
@@ -272,6 +288,7 @@ public class PurchaseInquiryItemSimpleInfo {
 		fields.add(SENDSTATUS_FIELD);
 		fields.add(INQUIRY_FIELD);
 		fields.add(SOURCEAPP_FIELD);
+		fields.add(KIND_FIELD);
 		return fields;
 	}
 
@@ -290,8 +307,7 @@ public class PurchaseInquiryItemSimpleInfo {
 				", sourceapp='" + sourceapp + '\'' +
 				", agreed=" + agreed +
 				", date=" + date +
+				", kind='" + kind + '\'' +
 				'}';
 	}
-
-
 }

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

@@ -780,6 +780,11 @@ public class DocumentToObjectUtils {
 			purcInquiryItem.setDate(new Date(Long.valueOf(document
 					.get(ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.DATE_FIELD)))));
 		}
+		if (null != document
+				.get(ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.KIND_FIELD))) {
+			purcInquiryItem.setKind(String.valueOf(document.get(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.KIND_FIELD))));
+		}
 		return purcInquiryItem;
 	}
 

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

@@ -1354,6 +1354,11 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.DATE_FIELD),
 					Long.valueOf(inquiryItem.getDate().getTime()), Store.YES));
 		}
+		if (inquiryItem.getKind() != null) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.KIND_FIELD),
+					String.valueOf(inquiryItem.getKind()), Store.YES));
+		}
 		// 排序字段
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.ID_FIELD),