加入排序字段

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

@@ -172,15 +172,17 @@ public class ObjectToDocumentUtils {
 							JSONObject.toJSONString(purchaseOrder.getOrderItems()), Store.YES));
 		}
 		// 排序字段
+
 		document.add(new NumericDocValuesField(
-				ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.ID_FIELD),
-				purchaseOrder.getId()));
+				ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.DISPLAY_FIELD),
+				purchaseOrder.getDisplay()));
 		document.add(new NumericDocValuesField(
 				ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.DATE_FIELD),
 				purchaseOrder.getDate().getTime()));
 		document.add(new NumericDocValuesField(
-				ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.DISPLAY_FIELD),
-				purchaseOrder.getDisplay()));
+				ClassAndTableNameUtils.combineField(tableName, PurchaseOrderSimpleInfo.ID_FIELD),
+				purchaseOrder.getId()));
+
 		return document;
 	}
 
@@ -228,6 +230,12 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, MakeOrderSimpleInfo.PRODUCT_FIELD),
 							JSONObject.toJSONString(makeOrder.getProduct()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, MakeOrderSimpleInfo.DATE_FIELD),
+				makeOrder.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, MakeOrderSimpleInfo.ID_FIELD), makeOrder.getId()));
 		return document;
 	}
 
@@ -269,6 +277,12 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.ITEMS_FIELD),
 							JSONObject.toJSONString(purcAccept.getAcceptItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.DATE_FIELD),
+				purcAccept.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseAcceptSimpleInfo.ID_FIELD), purcAccept.getId()));
 		return document;
 	}
 
@@ -312,6 +326,13 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, SaleQuotationSimpleInfo.ITEMS_FIELD),
 							JSONObject.toJSONString(saleQuotation.getSaleQuotationItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, SaleQuotationSimpleInfo.DATE_FIELD),
+				saleQuotation.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, SaleQuotationSimpleInfo.ID_FIELD),
+				saleQuotation.getId()));
 		return document;
 	}
 
@@ -348,6 +369,13 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseApbillSimpleInfo.ITEMS_FIELD),
 							JSONObject.toJSONString(purchapbill.getItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseApbillSimpleInfo.DATE_FIELD),
+				purchapbill.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseApbillSimpleInfo.ID_FIELD),
+				purchapbill.getId()));
 		return document;
 	}
 
@@ -395,6 +423,12 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseBadinSimpleInfo.ITEMS_FIELD),
 							JSONObject.toJSONString(purchBadin.getBadInItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseBadinSimpleInfo.DATE_FIELD),
+				purchBadin.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseBadinSimpleInfo.ID_FIELD), purchBadin.getId()));
 		return document;
 	}
 
@@ -441,6 +475,13 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseBadoutSimpleInfo.ITEMS_FIELD),
 							JSONObject.toJSONString(purchaseBadout.getBadOutItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseBadoutSimpleInfo.DATE_FIELD),
+				purchaseBadout.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseBadoutSimpleInfo.ID_FIELD),
+				purchaseBadout.getId()));
 		return document;
 	}
 
@@ -479,6 +520,13 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurchaseForecastSimpleInfo.ITEMS_FIELD),
 					JSONObject.toJSONString(purchaseForecast.getForecastItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseForecastSimpleInfo.DATE_FIELD),
+				purchaseForecast.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseForecastSimpleInfo.ID_FIELD),
+				purchaseForecast.getId()));
 		return document;
 	}
 
@@ -565,6 +613,12 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseMrbSimpleInfo.BADITEMS_FIELD),
 							JSONObject.toJSONString(purcMrb.getBadIn()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseMrbSimpleInfo.DATE_FIELD),
+				purcMrb.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseMrbSimpleInfo.ID_FIELD), purcMrb.getId()));
 		return document;
 
 	}
@@ -611,6 +665,13 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseChangesSimpleInfo.ITEMS_FIELD),
 							JSONObject.toJSONString(purcChanges.getOrderChangeItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseChangesSimpleInfo.DATE_FIELD),
+				purcChanges.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseChangesSimpleInfo.ID_FIELD),
+				purcChanges.getId()));
 		return document;
 	}
 
@@ -645,6 +706,10 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.PROOFING_FIELD),
 					JSONObject.toJSONString(purcProofingItem.getProofing()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.ID_FIELD),
+				purcProofingItem.getId()));
 		return document;
 	}
 
@@ -691,6 +756,12 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseReturnSimpleInfo.ITEMS_FIELD),
 							JSONObject.toJSONString(purcReturn.getReturnItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseReturnSimpleInfo.DATE_FIELD),
+				purcReturn.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseReturnSimpleInfo.ID_FIELD), purcReturn.getId()));
 		return document;
 	}
 
@@ -731,6 +802,12 @@ public class ObjectToDocumentUtils {
 			document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, MakeAcceptSimpleInfo.ITEMS_FIELD),
 					JSONObject.toJSONString(makeAccept.getAcceptItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, MakeAcceptSimpleInfo.DATE_FIELD),
+				makeAccept.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, MakeAcceptSimpleInfo.ID_FIELD), makeAccept.getId()));
 		return document;
 	}
 
@@ -770,6 +847,10 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.MAKE_FIELD),
 					JSONObject.toJSONString(makeChanges.getMakeChanges()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.ID_FIELD),
+				makeChanges.getId()));
 		return document;
 	}
 
@@ -810,6 +891,12 @@ public class ObjectToDocumentUtils {
 			document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, MakeReturnSimpleInfo.ITEMS_FIELD),
 					JSONObject.toJSONString(makeRetrun.getReturnItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, MakeReturnSimpleInfo.DATE_FIELD),
+				makeRetrun.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, MakeReturnSimpleInfo.ID_FIELD), makeRetrun.getId()));
 		return document;
 	}
 
@@ -853,6 +940,12 @@ public class ObjectToDocumentUtils {
 			document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.ITEMS_FIELD),
 					JSONObject.toJSONString(saleSend.getSendItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(
+				new NumericDocValuesField(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.DATE_FIELD),
+						saleSend.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.ID_FIELD), saleSend.getId()));
 		return document;
 	}
 
@@ -906,6 +999,12 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurchaseNoticeSimpleInfo.ORDERITEMS_FIELD),
 					JSONObject.toJSONString(purcNotice.getOrderItem()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseNoticeSimpleInfo.DATE_FIELD),
+				purcNotice.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseNoticeSimpleInfo.ID_FIELD), purcNotice.getId()));
 		return document;
 	}
 
@@ -964,13 +1063,20 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.SSCODE_FIELD),
 					purcProofingapproval.getSscode(), Store.YES));
 		}
+		// vend和orderItems以json的格式存储
 		document.add(
 				new TextField(ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.VEND_FIELD),
 						JSON.toJSONString(purcProofingapproval.getVend().getEnName()), Store.YES));
 		document.add(new TextField(
 				ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.ENTERPRISE_FIELD),
 				JSON.toJSONString(purcProofingapproval.getEnterprise().getEnName()), Store.YES));
-		// vend和orderItems以json的格式存储
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.DATE_FIELD),
+				purcProofingapproval.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurcProofingapprovalSimpleInfo.ID_FIELD),
+				purcProofingapproval.getId()));
 		return document;
 	}
 
@@ -1012,6 +1118,13 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurcProofingsendSimpleInfo.ITEMS_FIELD),
 					JSONObject.toJSONString(purcProofingsend.getProofingItem()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurcProofingsendSimpleInfo.DATE_FIELD),
+				purcProofingsend.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurcProofingsendSimpleInfo.ID_FIELD),
+				purcProofingsend.getId()));
 		return document;
 	}
 
@@ -1060,6 +1173,13 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, PurchaseApCheckSimpleInfo.ITEMS_FIELD),
 							JSONObject.toJSONString(purcApcheck.getItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseApCheckSimpleInfo.DATE_FIELD),
+				purcApcheck.getDate().getTime()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseApCheckSimpleInfo.ID_FIELD),
+				purcApcheck.getId()));
 		return document;
 	}
 
@@ -1101,6 +1221,12 @@ public class ObjectToDocumentUtils {
 					new TextField(ClassAndTableNameUtils.combineField(tableName, SaleArcheckSimpleInfo.ITEMS_FIELD),
 							JSONObject.toJSONString(saleArcheck.getItems()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, SaleArcheckSimpleInfo.ID_FIELD), saleArcheck.getId()));
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, SaleArcheckSimpleInfo.DATE_FIELD),
+				saleArcheck.getDate().getTime()));
 		return document;
 	}
 
@@ -1146,6 +1272,10 @@ public class ObjectToDocumentUtils {
 					ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.PRODUCT_FIELD),
 					JSONObject.toJSONString(inquiryItem.getProduct()), Store.YES));
 		}
+		// 排序字段
+		document.add(new NumericDocValuesField(
+				ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.ID_FIELD),
+				inquiryItem.getId()));
 		return document;
 	}
 }