代采订单搜索增加搜索字段

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/DeputyOrderSimpleInfo.java

@@ -1,12 +1,13 @@
 package com.uas.search.console.b2b.model;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -54,6 +55,10 @@ public class DeputyOrderSimpleInfo {
 
 	public static final String DOWNLOADSTATUS_FIELD = "deo_downloadstatus";
 
+	public static final String SALECODE_FIELD = "deo_salecode";
+
+	public static final String SALEPCODE_FIELD = "deo_salepocode";
+
 	/**
 	 * 主键id
 	 */
@@ -148,6 +153,18 @@ public class DeputyOrderSimpleInfo {
 	@Column(name = DOWNLOADSTATUS_FIELD)
 	private String downloadstatus;
 
+	/**
+	 * 采购单号
+	 */
+	@Column(name = SALECODE_FIELD)
+	private String salecode;
+
+	/**
+	 * 合同编号
+	 */
+	@Column(name = SALEPCODE_FIELD)
+	private String salepocode;
+
 	public Long getId() {
 		return id;
 	}
@@ -268,6 +285,22 @@ public class DeputyOrderSimpleInfo {
 		this.downloadstatus = downloadstatus;
 	}
 
+	public String getSalecode() {
+		return salecode;
+	}
+
+	public void setSalecode(String salecode) {
+		this.salecode = salecode;
+	}
+
+	public String getSalepocode() {
+		return salepocode;
+	}
+
+	public void setSalepocode(String salepocode) {
+		this.salepocode = salepocode;
+	}
+
 	/**
 	 * 获取除了status外的所有字段的列名（field名）
 	 * 
@@ -285,6 +318,8 @@ public class DeputyOrderSimpleInfo {
 		fields.add(TERVENDUU_FEILD);
 		fields.add(VENDUSERUU_FIELD);
 		fields.add(VENDUSER_FIELD);
+		fields.add(SALECODE_FIELD);
+		fields.add(SALEPCODE_FIELD);
 		return fields;
 	}
 

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

@@ -596,6 +596,16 @@ public class DocumentToObjectUtils {
 			depOrder.setCode(
 					document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CODE_FIELD)));
 		}
+		if (!StringUtils.isEmpty(
+				document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.SALECODE_FIELD)))) {
+			depOrder.setSalecode(
+					document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.SALECODE_FIELD)));
+		}
+		if (!StringUtils.isEmpty(
+				document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.SALEPCODE_FIELD)))) {
+			depOrder.setSalepocode(document
+					.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.SALEPCODE_FIELD)));
+		}
 		if (!StringUtils.isEmpty(document
 				.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.COMPANYNAME_FIELD)))) {
 			depOrder.setCompanyname(document

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

@@ -1932,10 +1932,19 @@ public class ObjectToDocumentUtils {
 					String.valueOf(depOrder.getId()), Store.YES));
 		}
 		if (!StringUtils.isEmpty(depOrder.getCode())) {
-			document.add(
-					new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CODE_FIELD),
+			document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CODE_FIELD),
 							String.valueOf(depOrder.getCode()), Store.YES));
 		}
+		if (!StringUtils.isEmpty(depOrder.getSalecode())) {
+			document.add(
+					new TextField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.SALECODE_FIELD),
+							String.valueOf(depOrder.getSalecode()), Store.YES));
+		}
+		if (!StringUtils.isEmpty(depOrder.getSalepocode())) {
+			document.add(
+					new TextField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.SALEPCODE_FIELD),
+					String.valueOf(depOrder.getSalepocode()), Store.YES));
+		}
 		if (!StringUtils.isEmpty(depOrder.getCustomer())) {
 			document.add(new StringField(
 					ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CUSTOMER_FIELD),