公共询价增加过滤条件

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

@@ -15,7 +15,7 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
 /**
- * 平台里面，以供应商的角度来查看采购询价单明细
+ * 平台里面采购询价单详情
  * 
  * @author yingp
  *
@@ -37,6 +37,8 @@ public class PurcInquiryItemSimpleInfo2 {
 
 	public static final String OVERDUE_FIELD = "id_overdue";
 
+	public static final String ISOPEN_FIELD = "id_isopen";
+
 	@Id
 	@Column(name = ID_FIELD)
 	private Long id;
@@ -62,6 +64,12 @@ public class PurcInquiryItemSimpleInfo2 {
 	 */
 	private Short id_overdue;
 
+	/**
+	 * 是否公开
+	 */
+	@Column(name = ISOPEN_FIELD)
+	private Short isOpen;
+
 	public Long getId() {
 		return id;
 	}
@@ -86,6 +94,14 @@ public class PurcInquiryItemSimpleInfo2 {
 		this.inquiry = inquiry;
 	}
 
+	public Short getIsOpen() {
+		return isOpen;
+	}
+
+	public void setIsOpen(Short isOpen) {
+		this.isOpen = isOpen;
+	}
+
 	@SuppressWarnings("deprecation")
 	public Short getOverdue() {
 		if (this.getInquiry().getEndDate() == null) {
@@ -115,13 +131,15 @@ public class PurcInquiryItemSimpleInfo2 {
 		List<String> fields = new ArrayList<>();
 		fields.add(PRODUCT_FIELD);
 		fields.add(INQUIRY_FIELD);
+		fields.add(OVERDUE_FIELD);
+		fields.add(ISOPEN_FIELD);
 		return fields;
 	}
 
 	@Override
 	public String toString() {
 		return "PurcInquiryItemSimpleInfo2 [id=" + id + ", product=" + product + ", inquiry=" + inquiry
-				+ ", id_overdue=" + id_overdue + "]";
+				+ ", id_overdue=" + id_overdue + ", isOpen=" + isOpen + "]";
 	}
 
 }

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

@@ -197,6 +197,11 @@ public class DocumentToObjectUtils {
 							ClassAndTableNameUtils.combineField(tableName, PurcInquiryItemSimpleInfo2.INQUIRY_FIELD)),
 					PurcInquirySimpleInfo2.class));
 		}
+		if (null != document
+				.get(ClassAndTableNameUtils.combineField(tableName, PurcInquiryItemSimpleInfo2.ISOPEN_FIELD))) {
+			purcInquiryItem.setIsOpen(Short.valueOf(document
+					.get(ClassAndTableNameUtils.combineField(tableName, PurcInquiryItemSimpleInfo2.ISOPEN_FIELD))));
+		}
 		return purcInquiryItem;
 	}
 

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

@@ -2077,6 +2077,11 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurcInquiryItemSimpleInfo2.PRODUCT_FIELD),
 					JSONObject.toJSONString(inquiryItem.getProduct()), Store.YES));
 		}
+		if (null != inquiryItem.getIsOpen()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, PurcInquiryItemSimpleInfo2.ISOPEN_FIELD),
+					String.valueOf(inquiryItem.getIsOpen()), Store.YES));
+		}
 		// 排序字段
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, PurcInquiryItemSimpleInfo2.ID_FIELD),